From 888c8511671bac9e649b6bc3a28de912e63155ac Mon Sep 17 00:00:00 2001 From: fufesou Date: Thu, 30 Mar 2023 11:17:24 +0800 Subject: [PATCH] desktop, remote toolbar, os account Signed-off-by: fufesou --- flutter/lib/common/widgets/dialog.dart | 7 +------ .../lib/desktop/pages/connection_page.dart | 14 +++++-------- .../lib/desktop/widgets/remote_toolbar.dart | 21 +++++++++++++++++++ libs/hbb_common/src/config.rs | 4 ++-- src/lang/ca.rs | 8 +++---- src/lang/cn.rs | 10 ++++----- src/lang/cs.rs | 8 +++---- src/lang/da.rs | 8 +++---- src/lang/de.rs | 10 ++++----- src/lang/el.rs | 10 ++++----- src/lang/en.rs | 4 ++-- src/lang/eo.rs | 8 +++---- src/lang/es.rs | 10 ++++----- src/lang/fa.rs | 8 +++---- src/lang/fr.rs | 2 +- src/lang/hu.rs | 8 +++---- src/lang/id.rs | 8 +++---- src/lang/it.rs | 10 ++++----- src/lang/ja.rs | 8 +++---- src/lang/ko.rs | 8 +++---- src/lang/kz.rs | 8 +++---- src/lang/nl.rs | 10 ++++----- src/lang/pl.rs | 2 +- src/lang/pt_PT.rs | 8 +++---- src/lang/ptbr.rs | 8 +++---- src/lang/ro.rs | 8 +++---- src/lang/ru.rs | 10 ++++----- src/lang/sk.rs | 8 +++---- src/lang/sl.rs | 8 +++---- src/lang/sq.rs | 8 +++---- src/lang/sr.rs | 8 +++---- src/lang/sv.rs | 8 +++---- src/lang/template.rs | 5 ++--- src/lang/th.rs | 8 +++---- src/lang/tr.rs | 8 +++---- src/lang/tw.rs | 10 ++++----- src/lang/ua.rs | 8 +++---- src/lang/vn.rs | 8 +++---- 38 files changed, 133 insertions(+), 182 deletions(-) diff --git a/flutter/lib/common/widgets/dialog.dart b/flutter/lib/common/widgets/dialog.dart index 0fdd17a4b..86611cd8a 100644 --- a/flutter/lib/common/widgets/dialog.dart +++ b/flutter/lib/common/widgets/dialog.dart @@ -503,11 +503,6 @@ _connectDialog( } submit() { - // to-do: - // username and password are about remote OS account. - // If the remote side is headless. - // The client side should login to remote OS account, to enable X desktop session. - // `username` and `password` will be used in the near future. final osUsername = osUsernameController?.text.trim() ?? ''; final osPassword = osPasswordController?.text.trim() ?? ''; final password = passwordController?.text.trim() ?? ''; @@ -565,7 +560,7 @@ _connectDialog( } return Column( children: [ - descWidget(translate('login_linux_tooltip_tip')), + descWidget(translate('login_linux_tip')), DialogTextField( title: translate(DialogTextField.kUsernameTitle), controller: osUsernameController, diff --git a/flutter/lib/desktop/pages/connection_page.dart b/flutter/lib/desktop/pages/connection_page.dart index 63d6b9c7b..480ea75ff 100644 --- a/flutter/lib/desktop/pages/connection_page.dart +++ b/flutter/lib/desktop/pages/connection_page.dart @@ -225,20 +225,16 @@ class _ConnectionPageState extends State children: [ Button( isOutline: true, - onTap: () { - onConnect(isFileTransfer: true); - }, + onTap: () => enterUserLoginAndPasswordDialog( + 'fdsfd', + gFFI.dialogManager, + ), text: "Transfer File", ), const SizedBox( width: 17, ), - Button( - onTap: () => enterUserLoginAndPasswordDialog( - 'fdsfd', - gFFI.dialogManager, - ), - text: "Connect"), + Button(onTap: onConnect, text: "Connect"), ], ), ) diff --git a/flutter/lib/desktop/widgets/remote_toolbar.dart b/flutter/lib/desktop/widgets/remote_toolbar.dart index 467cd69b0..ec4d32ee0 100644 --- a/flutter/lib/desktop/widgets/remote_toolbar.dart +++ b/flutter/lib/desktop/widgets/remote_toolbar.dart @@ -689,6 +689,26 @@ class _ControlMenu extends StatelessWidget { close(); } + descWidget(String text) { + return Column( + children: [ + Align( + alignment: Alignment.centerLeft, + child: Text( + text, + maxLines: 3, + softWrap: true, + overflow: TextOverflow.ellipsis, + style: TextStyle(fontSize: 16), + ), + ), + Container( + height: 8, + ), + ], + ); + } + return CustomAlertDialog( title: Row( mainAxisAlignment: MainAxisAlignment.center, @@ -700,6 +720,7 @@ class _ControlMenu extends StatelessWidget { content: Column( mainAxisSize: MainAxisSize.min, children: [ + descWidget(translate("os_account_desk_tip")), DialogTextField( title: translate(DialogTextField.kUsernameTitle), controller: usernameController, diff --git a/libs/hbb_common/src/config.rs b/libs/hbb_common/src/config.rs index 6a823c7b7..3841bf976 100644 --- a/libs/hbb_common/src/config.rs +++ b/libs/hbb_common/src/config.rs @@ -915,7 +915,7 @@ impl PeerConfig { decrypt_vec_or_original(&config.password, PASSWORD_ENC_VERSION); config.password = password; store = store || store2; - for opt in ["rdp_password", "os-password"] { + for opt in ["rdp_password", "os-username", "os-password"] { if let Some(v) = config.options.get_mut(opt) { let (encrypted, _, store2) = decrypt_str_or_original(v, PASSWORD_ENC_VERSION); *v = encrypted; @@ -938,7 +938,7 @@ impl PeerConfig { let _lock = CONFIG.read().unwrap(); let mut config = self.clone(); config.password = encrypt_vec_or_original(&config.password, PASSWORD_ENC_VERSION); - for opt in ["rdp_password", "os-password"] { + for opt in ["rdp_password", "os-username", "os-password"] { if let Some(v) = config.options.get_mut(opt) { *v = encrypt_str_or_original(v, PASSWORD_ENC_VERSION) } diff --git a/src/lang/ca.rs b/src/lang/ca.rs index af744d153..6f4ce9543 100644 --- a/src/lang/ca.rs +++ b/src/lang/ca.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "Tancar"), ("Retry", "Reintentar"), ("OK", ""), - ("remember_password_tip", "Es necessita la contrasenya"), + ("remember_password_tip", ""), ("Please enter your password", "Si us plau, introdueixi la seva contrasenya"), ("Remember password", "Recordar contrasenya"), ("Wrong Password", "Contrasenya incorrecta"), @@ -480,12 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", ""), ("show_monitors_tip", ""), ("View Mode", ""), - ("enter_rustdesk_passwd_tip", ""), - ("remember_rustdesk_passwd_tip", ""), ("login_linux_tip", ""), - ("login_linux_tooltip_tip", ""), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), - ("remember_password_tip", ""), + ("os_account_desk_tip", ""), + ("OS Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/cn.rs b/src/lang/cn.rs index 584be4333..5262db44c 100644 --- a/src/lang/cn.rs +++ b/src/lang/cn.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "关闭"), ("Retry", "再试"), ("OK", "确认"), - ("remember_password_tip", "需要密码"), + ("remember_password_tip", ""), ("Please enter your password", "请输入密码"), ("Remember password", "记住密码"), ("Wrong Password", "密码错误"), @@ -480,12 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", "此文件与对方的一致"), ("show_monitors_tip", ""), ("View Mode", "浏览模式"), - ("enter_rustdesk_passwd_tip", "请输入 RustDesk 密码"), - ("remember_rustdesk_passwd_tip", "记住 RustDesk 密码"), - ("login_linux_tip", "登录被控端的 Linux 账户"), - ("login_linux_tooltip_tip", "登录被控端的 Linux 账户，才能启用 X 桌面。"), + ("login_linux_tip", "登录被控端的 Linux 账户，才能启用 X 桌面"), ("verify_rustdesk_password_tip", "验证 RustDesk 密码"), ("remember_account_tip", "记住此账户"), - ("remember_password_tip", ""), + ("os_account_desk_tip", "在无显示器的环境下，此账户用于登录被控系统，并启用桌面"), + ("OS Account", "系统账户"), ].iter().cloned().collect(); } diff --git a/src/lang/cs.rs b/src/lang/cs.rs index cb882277e..58d10b5ee 100644 --- a/src/lang/cs.rs +++ b/src/lang/cs.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "Zavřít"), ("Retry", "Zkusit znovu"), ("OK", "OK"), - ("remember_password_tip", "Vyžadováno heslo"), + ("remember_password_tip", ""), ("Please enter your password", "Zadejte své heslo"), ("Remember password", "Zapamatovat heslo"), ("Wrong Password", "Nesprávné heslo"), @@ -480,12 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", ""), ("show_monitors_tip", ""), ("View Mode", ""), - ("enter_rustdesk_passwd_tip", ""), - ("remember_rustdesk_passwd_tip", ""), ("login_linux_tip", ""), - ("login_linux_tooltip_tip", ""), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), - ("remember_password_tip", ""), + ("os_account_desk_tip", ""), + ("OS Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/da.rs b/src/lang/da.rs index ad6ddfc48..7e6888239 100644 --- a/src/lang/da.rs +++ b/src/lang/da.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "Luk"), ("Retry", "Prøv igen"), ("OK", "OK"), - ("remember_password_tip", "Adgangskode påkrævet"), + ("remember_password_tip", ""), ("Please enter your password", "Indtast venligst dit kodeord"), ("Remember password", "Husk kodeord"), ("Wrong Password", "Forkert kodeord"), @@ -480,12 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", ""), ("show_monitors_tip", ""), ("View Mode", ""), - ("enter_rustdesk_passwd_tip", ""), - ("remember_rustdesk_passwd_tip", ""), ("login_linux_tip", ""), - ("login_linux_tooltip_tip", ""), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), - ("remember_password_tip", ""), + ("os_account_desk_tip", ""), + ("OS Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/de.rs b/src/lang/de.rs index 263664d4c..ad9196785 100644 --- a/src/lang/de.rs +++ b/src/lang/de.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "Schließen"), ("Retry", "Erneut versuchen"), ("OK", "OK"), - ("remember_password_tip", "Passwort erforderlich"), + ("remember_password_tip", ""), ("Please enter your password", "Bitte geben Sie Ihr Passwort ein"), ("Remember password", "Passwort merken"), ("Wrong Password", "Falsches Passwort"), @@ -480,12 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", "Diese Datei ist identisch mit der Datei der Gegenstelle."), ("show_monitors_tip", "Monitore in der Symbolleiste anzeigen"), ("View Mode", "Ansichtsmodus"), - ("enter_rustdesk_passwd_tip", "RustDesk-Passwort eingeben."), - ("remember_rustdesk_passwd_tip", "RustDesk-Passwort merken."), - ("login_linux_tip", "Anmeldung am entfernten Linux-Konto"), - ("login_linux_tooltip_tip", "Sie müssen sich an einem entfernten Linux-Konto anmelden, um eine X-Desktop-Sitzung zu eröffnen."), + ("login_linux_tip", "Sie müssen sich an einem entfernten Linux-Konto anmelden, um eine X-Desktop-Sitzung zu eröffnen."), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), - ("remember_password_tip", ""), + ("os_account_desk_tip", ""), + ("OS Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/el.rs b/src/lang/el.rs index 9597ae158..50778f4c4 100644 --- a/src/lang/el.rs +++ b/src/lang/el.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "Κλείσιμο"), ("Retry", "Δοκίμασε ξανά"), ("OK", "ΟΚ"), - ("remember_password_tip", "Απαιτείται κωδικός πρόσβασης"), + ("remember_password_tip", ""), ("Please enter your password", "Παρακαλώ εισάγετε τον κωδικό πρόσβασης"), ("Remember password", "Απομνημόνευση κωδικού πρόσβασης"), ("Wrong Password", "Λάθος κωδικός πρόσβασης"), @@ -480,12 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", "Το αρχείο είναι πανομοιότυπο με αυτό του άλλου υπολογιστή."), ("show_monitors_tip", "Εμφάνιση οθονών στη γραμμή εργαλείων"), ("View Mode", "Λειτουργία προβολής"), - ("enter_rustdesk_passwd_tip", "Εισαγωγή του κωδικού RustDesk."), - ("remember_rustdesk_passwd_tip", "Να θυμάσαι τον κωδικό του RustDesk."), - ("login_linux_tip", "Είσοδος σε απομακρυσμένο λογαριασμό Linux"), - ("login_linux_tooltip_tip", "Απαιτείται είσοδος σε απομακρυσμένο λογαριασμό Linux για την ενεργοποίηση του περιβάλλον εργασίας Χ."), + ("login_linux_tip", "Απαιτείται είσοδος σε απομακρυσμένο λογαριασμό Linux για την ενεργοποίηση του περιβάλλον εργασίας Χ."), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), - ("remember_password_tip", ""), + ("os_account_desk_tip", ""), + ("OS Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/en.rs b/src/lang/en.rs index 79f18ebc5..2ea65b05f 100644 --- a/src/lang/en.rs +++ b/src/lang/en.rs @@ -56,10 +56,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("show_monitors_tip", "Show monitors in toolbar."), ("enter_rustdesk_passwd_tip", "Enter RustDesk password"), ("remember_rustdesk_passwd_tip", "Remember RustDesk password"), - ("login_linux_tip", "Login to remote Linux account"), - ("login_linux_tooltip_tip", "You need to login to remote Linux account to enable a X desktop session"), + ("login_linux_tip", "You need to login to remote Linux account to enable a X desktop session"), ("verify_rustdesk_password_tip", "Veryfy RustDesk password"), ("remember_account_tip", "Remember this account"), ("remember_password_tip", "Remember password"), + ("os_account_desk_tip", "This account is used to login the remote OS and enable the desktop session in headless"), ].iter().cloned().collect(); } diff --git a/src/lang/eo.rs b/src/lang/eo.rs index aeee842f7..9fcc2b451 100644 --- a/src/lang/eo.rs +++ b/src/lang/eo.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "Fermi"), ("Retry", "Reprovi"), ("OK", "Konfermi"), - ("remember_password_tip", "Pasvorto deviga"), + ("remember_password_tip", ""), ("Please enter your password", "Bonvolu tajpi vian pasvorton"), ("Remember password", "Memori pasvorton"), ("Wrong Password", "Erara pasvorto"), @@ -480,12 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", ""), ("show_monitors_tip", ""), ("View Mode", ""), - ("enter_rustdesk_passwd_tip", ""), - ("remember_rustdesk_passwd_tip", ""), ("login_linux_tip", ""), - ("login_linux_tooltip_tip", ""), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), - ("remember_password_tip", ""), + ("os_account_desk_tip", ""), + ("OS Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/es.rs b/src/lang/es.rs index 3b998ae7d..c8120de49 100644 --- a/src/lang/es.rs +++ b/src/lang/es.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "Cerrar"), ("Retry", "Reintentar"), ("OK", ""), - ("remember_password_tip", "Se requiere contraseña"), + ("remember_password_tip", ""), ("Please enter your password", "Por favor, introduzca su contraseña"), ("Remember password", "Recordar contraseña"), ("Wrong Password", "Contraseña incorrecta"), @@ -480,12 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", "Este archivo es idéntico al del par."), ("show_monitors_tip", "Mostrar monitores en la barra de herramientas"), ("View Mode", "Modo Vista"), - ("enter_rustdesk_passwd_tip", "Introduzca la contraseña de RustDesk"), - ("remember_rustdesk_passwd_tip", "Recordar la contraseña de RustDesk"), - ("login_linux_tip", "Iniciar sesión para la cuenta remota de Linux"), - ("login_linux_tooltip_tip", ""), + ("login_linux_tip", ""), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), - ("remember_password_tip", ""), + ("os_account_desk_tip", ""), + ("OS Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/fa.rs b/src/lang/fa.rs index e2137c3e2..ccf2a670a 100644 --- a/src/lang/fa.rs +++ b/src/lang/fa.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "بستن"), ("Retry", "تلاش مجدد"), ("OK", "قبول"), - ("remember_password_tip", "رمز عبور لازم است"), + ("remember_password_tip", ""), ("Please enter your password", "رمز عبور خود را وارد کنید"), ("Remember password", "رمز عبور را به خاطر بسپار"), ("Wrong Password", "رمز عبور اشتباه است"), @@ -480,12 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", "این فایل با فایل همتا یکسان است."), ("show_monitors_tip", "نمایش مانیتورها در نوار ابزار"), ("View Mode", ""), - ("enter_rustdesk_passwd_tip", ""), - ("remember_rustdesk_passwd_tip", ""), ("login_linux_tip", ""), - ("login_linux_tooltip_tip", ""), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), - ("remember_password_tip", ""), + ("os_account_desk_tip", ""), + ("OS Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/fr.rs b/src/lang/fr.rs index 71c0f6728..2ff02d8f9 100644 --- a/src/lang/fr.rs +++ b/src/lang/fr.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "Fermer"), ("Retry", "Réessayer"), ("OK", "Valider"), - ("remember_password_tip", "Mot de passe requis"), + ("remember_password_tip", ""), ("Please enter your password", "Veuillez saisir votre mot de passe"), ("Remember password", "Mémoriser le mot de passe"), ("Wrong Password", "Mauvais mot de passe"), diff --git a/src/lang/hu.rs b/src/lang/hu.rs index 7c7fb2468..49e767b84 100644 --- a/src/lang/hu.rs +++ b/src/lang/hu.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "Bezárás"), ("Retry", "Újra"), ("OK", "OK"), - ("remember_password_tip", "Jelszó megadása kötelező"), + ("remember_password_tip", ""), ("Please enter your password", "Kérem írja be a jelszavát"), ("Remember password", "Jelszó megjegyzése"), ("Wrong Password", "Hibás jelszó"), @@ -480,12 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", ""), ("show_monitors_tip", ""), ("View Mode", ""), - ("enter_rustdesk_passwd_tip", ""), - ("remember_rustdesk_passwd_tip", ""), ("login_linux_tip", ""), - ("login_linux_tooltip_tip", ""), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), - ("remember_password_tip", ""), + ("os_account_desk_tip", ""), + ("OS Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/id.rs b/src/lang/id.rs index 174d970b6..2c410c0ec 100644 --- a/src/lang/id.rs +++ b/src/lang/id.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "Tutup"), ("Retry", "Ulangi"), ("OK", "Oke"), - ("remember_password_tip", "Kata sandi dibutuhkan"), + ("remember_password_tip", ""), ("Please enter your password", "Silahkan masukkan kata sandi anda"), ("Remember password", "Ingat Password"), ("Wrong Password", "Kata sandi Salah"), @@ -480,12 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", ""), ("show_monitors_tip", ""), ("View Mode", ""), - ("enter_rustdesk_passwd_tip", ""), - ("remember_rustdesk_passwd_tip", ""), ("login_linux_tip", ""), - ("login_linux_tooltip_tip", ""), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), - ("remember_password_tip", ""), + ("os_account_desk_tip", ""), + ("OS Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/it.rs b/src/lang/it.rs index 94b7d10a9..4427743f1 100644 --- a/src/lang/it.rs +++ b/src/lang/it.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "Chiudi"), ("Retry", "Riprova"), ("OK", "OK"), - ("remember_password_tip", "Password Richiesta"), + ("remember_password_tip", ""), ("Please enter your password", "Inserisci la tua password"), ("Remember password", "Ricorda password"), ("Wrong Password", "Password Errata"), @@ -480,12 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", "Questo file è identico a quello del peer."), ("show_monitors_tip", "Mostra schermi nella barra degli strumenti"), ("View Mode", "Modalità di visualizzazione"), - ("enter_rustdesk_passwd_tip", "Inserisci la password di RustDesk."), - ("remember_rustdesk_passwd_tip", "Ricorda la passowrd di RustDesk."), - ("login_linux_tip", "Effettua l'accesso sul tuo account Linux"), - ("login_linux_tooltip_tip", ""), + ("login_linux_tip", ""), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), - ("remember_password_tip", ""), + ("os_account_desk_tip", ""), + ("OS Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ja.rs b/src/lang/ja.rs index 95395c516..dba70c1e1 100644 --- a/src/lang/ja.rs +++ b/src/lang/ja.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "閉じる"), ("Retry", "再試行"), ("OK", "OK"), - ("remember_password_tip", "パスワードが必要"), + ("remember_password_tip", ""), ("Please enter your password", "パスワードを入力してください"), ("Remember password", "パスワードを記憶する"), ("Wrong Password", "パスワードが間違っています"), @@ -480,12 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", ""), ("show_monitors_tip", ""), ("View Mode", ""), - ("enter_rustdesk_passwd_tip", ""), - ("remember_rustdesk_passwd_tip", ""), ("login_linux_tip", ""), - ("login_linux_tooltip_tip", ""), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), - ("remember_password_tip", ""), + ("os_account_desk_tip", ""), + ("OS Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ko.rs b/src/lang/ko.rs index 4e3b52ea2..ab7714190 100644 --- a/src/lang/ko.rs +++ b/src/lang/ko.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "닫기"), ("Retry", "재시도"), ("OK", "확인"), - ("remember_password_tip", "비밀번호 입력"), + ("remember_password_tip", ""), ("Please enter your password", "비밀번호를 입력해주세요"), ("Remember password", "이 비밀번호 기억하기"), ("Wrong Password", "틀린 비밀번호"), @@ -480,12 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", ""), ("show_monitors_tip", ""), ("View Mode", ""), - ("enter_rustdesk_passwd_tip", ""), - ("remember_rustdesk_passwd_tip", ""), ("login_linux_tip", ""), - ("login_linux_tooltip_tip", ""), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), - ("remember_password_tip", ""), + ("os_account_desk_tip", ""), + ("OS Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/kz.rs b/src/lang/kz.rs index bfe312e02..7fe2719cc 100644 --- a/src/lang/kz.rs +++ b/src/lang/kz.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "Жабу"), ("Retry", "Қайтадан көру"), ("OK", "OK"), - ("remember_password_tip", "Құпия сөз Қажет"), + ("remember_password_tip", ""), ("Please enter your password", "Құпия сөзіңізді еңгізуді өтінеміз"), ("Remember password", "Құпия сөзді есте сақтау"), ("Wrong Password", "Бұрыс Құпия сөз"), @@ -480,12 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", ""), ("show_monitors_tip", ""), ("View Mode", ""), - ("enter_rustdesk_passwd_tip", ""), - ("remember_rustdesk_passwd_tip", ""), ("login_linux_tip", ""), - ("login_linux_tooltip_tip", ""), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), - ("remember_password_tip", ""), + ("os_account_desk_tip", ""), + ("OS Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/nl.rs b/src/lang/nl.rs index 4a3c9c062..360166e50 100644 --- a/src/lang/nl.rs +++ b/src/lang/nl.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "Sluit"), ("Retry", "Probeer opnieuw"), ("OK", "OK"), - ("remember_password_tip", "Wachtwoord vereist"), + ("remember_password_tip", ""), ("Please enter your password", "Geef uw wachtwoord in"), ("Remember password", "Wachtwoord onthouden"), ("Wrong Password", "Verkeerd wachtwoord"), @@ -480,12 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", "Dit bestand is identiek aan het bestand van het externe station."), ("show_monitors_tip", "Monitoren weergeven in de werkbalk"), ("View Mode", "Weergave Mode"), - ("enter_rustdesk_passwd_tip", "Geef het RustDesk-wachtwoord op."), - ("remember_rustdesk_passwd_tip", "RustDesk Wachtwoord onthouden."), - ("login_linux_tip", "Je moet inloggen op een Linux Account op afstand om een X desktop sessie te openen."), - ("login_linux_tooltip_tip", ""), + ("login_linux_tip", ""), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), - ("remember_password_tip", ""), + ("os_account_desk_tip", ""), + ("OS Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/pl.rs b/src/lang/pl.rs index f68d37866..d89b6f763 100644 --- a/src/lang/pl.rs +++ b/src/lang/pl.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "Zamknij"), ("Retry", "Ponów"), ("OK", "OK"), - ("remember_password_tip", "Wymagane jest hasło"), + ("remember_password_tip", ""), ("Please enter your password", "Wpisz proszę twoje hasło"), ("Remember password", "Zapamiętaj hasło"), ("Wrong Password", "Błędne hasło"), diff --git a/src/lang/pt_PT.rs b/src/lang/pt_PT.rs index 04689f713..c23aa1e46 100644 --- a/src/lang/pt_PT.rs +++ b/src/lang/pt_PT.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "Fechar"), ("Retry", "Tentar novamente"), ("OK", "Confirmar"), - ("remember_password_tip", "Palavra-chave Necessária"), + ("remember_password_tip", ""), ("Please enter your password", "Por favor introduza a sua palavra-chave"), ("Remember password", "Memorizar palavra-chave"), ("Wrong Password", "Palavra-chave inválida"), @@ -480,12 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", ""), ("show_monitors_tip", ""), ("View Mode", ""), - ("enter_rustdesk_passwd_tip", ""), - ("remember_rustdesk_passwd_tip", ""), ("login_linux_tip", ""), - ("login_linux_tooltip_tip", ""), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), - ("remember_password_tip", ""), + ("os_account_desk_tip", ""), + ("OS Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ptbr.rs b/src/lang/ptbr.rs index 6f6302a59..c741944a1 100644 --- a/src/lang/ptbr.rs +++ b/src/lang/ptbr.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "Fechar"), ("Retry", "Tentar novamente"), ("OK", "OK"), - ("remember_password_tip", "Senha necessária"), + ("remember_password_tip", ""), ("Please enter your password", "Por favor informe sua senha"), ("Remember password", "Lembrar senha"), ("Wrong Password", "Senha incorreta"), @@ -480,12 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", ""), ("show_monitors_tip", ""), ("View Mode", ""), - ("enter_rustdesk_passwd_tip", ""), - ("remember_rustdesk_passwd_tip", ""), ("login_linux_tip", ""), - ("login_linux_tooltip_tip", ""), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), - ("remember_password_tip", ""), + ("os_account_desk_tip", ""), + ("OS Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ro.rs b/src/lang/ro.rs index ade2e3c36..d77345356 100644 --- a/src/lang/ro.rs +++ b/src/lang/ro.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "Închide"), ("Retry", "Reîncearcă"), ("OK", "OK"), - ("remember_password_tip", "Parolă necesară"), + ("remember_password_tip", ""), ("Please enter your password", "Introdu parola"), ("Remember password", "Memorează parola"), ("Wrong Password", "Parolă incorectă"), @@ -480,12 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", ""), ("show_monitors_tip", ""), ("View Mode", ""), - ("enter_rustdesk_passwd_tip", ""), - ("remember_rustdesk_passwd_tip", ""), ("login_linux_tip", ""), - ("login_linux_tooltip_tip", ""), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), - ("remember_password_tip", ""), + ("os_account_desk_tip", ""), + ("OS Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ru.rs b/src/lang/ru.rs index c85582e86..fbd1c4c62 100644 --- a/src/lang/ru.rs +++ b/src/lang/ru.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "Закрыть"), ("Retry", "Повторить"), ("OK", "ОК"), - ("remember_password_tip", "Требуется пароль"), + ("remember_password_tip", ""), ("Please enter your password", "Введите пароль"), ("Remember password", "Запомнить пароль"), ("Wrong Password", "Неправильный пароль"), @@ -480,12 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", "Файл идентичен файлу на удалённом узле."), ("show_monitors_tip", "Показывать мониторы на панели инструментов"), ("View Mode", "Режим просмотра"), - ("enter_rustdesk_passwd_tip", "Введите пароль RustDesk"), - ("remember_rustdesk_passwd_tip", "Запомнить пароль RustDesk"), - ("login_linux_tip", "Вход в удалённый аккаунт Linux"), - ("login_linux_tooltip_tip", "Чтобы включить сеанс рабочего стола X, необходимо войти в удалённый аккаунт Linux."), + ("login_linux_tip", "Чтобы включить сеанс рабочего стола X, необходимо войти в удалённый аккаунт Linux."), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), - ("remember_password_tip", ""), + ("os_account_desk_tip", ""), + ("OS Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sk.rs b/src/lang/sk.rs index e7c108a8c..efa66f7ae 100644 --- a/src/lang/sk.rs +++ b/src/lang/sk.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "Zatvoriť"), ("Retry", "Zopakovať"), ("OK", "OK"), - ("remember_password_tip", "Vyžaduje sa heslo"), + ("remember_password_tip", ""), ("Please enter your password", "Zadajte vaše heslo"), ("Remember password", "Zapamätať heslo"), ("Wrong Password", "Chybné heslo"), @@ -480,12 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", ""), ("show_monitors_tip", ""), ("View Mode", ""), - ("enter_rustdesk_passwd_tip", ""), - ("remember_rustdesk_passwd_tip", ""), ("login_linux_tip", ""), - ("login_linux_tooltip_tip", ""), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), - ("remember_password_tip", ""), + ("os_account_desk_tip", ""), + ("OS Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sl.rs b/src/lang/sl.rs index 0e5265b87..d897e4755 100755 --- a/src/lang/sl.rs +++ b/src/lang/sl.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "Zapri"), ("Retry", "Ponovi"), ("OK", "V redu"), - ("remember_password_tip", "Potrebno je geslo"), + ("remember_password_tip", ""), ("Please enter your password", "Vnesite vaše geslo"), ("Remember password", "Zapomni si geslo"), ("Wrong Password", "Napačno geslo"), @@ -480,12 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", ""), ("show_monitors_tip", ""), ("View Mode", ""), - ("enter_rustdesk_passwd_tip", ""), - ("remember_rustdesk_passwd_tip", ""), ("login_linux_tip", ""), - ("login_linux_tooltip_tip", ""), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), - ("remember_password_tip", ""), + ("os_account_desk_tip", ""), + ("OS Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sq.rs b/src/lang/sq.rs index 68ef47be9..88d678ed3 100644 --- a/src/lang/sq.rs +++ b/src/lang/sq.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "Mbyll"), ("Retry", "Riprovo"), ("OK", "OK"), - ("remember_password_tip", "Fjalëkalimi i detyrueshëm"), + ("remember_password_tip", ""), ("Please enter your password", "Ju lutem vendosni fjalëkalimin tuaj"), ("Remember password", "Mbani mend fjalëkalimin"), ("Wrong Password", "Fjalëkalim i gabuar"), @@ -480,12 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", ""), ("show_monitors_tip", ""), ("View Mode", ""), - ("enter_rustdesk_passwd_tip", ""), - ("remember_rustdesk_passwd_tip", ""), ("login_linux_tip", ""), - ("login_linux_tooltip_tip", ""), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), - ("remember_password_tip", ""), + ("os_account_desk_tip", ""), + ("OS Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sr.rs b/src/lang/sr.rs index ccb328e3e..078d9ba29 100644 --- a/src/lang/sr.rs +++ b/src/lang/sr.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "Zatvori"), ("Retry", "Ponovi"), ("OK", "Ok"), - ("remember_password_tip", "Potrebna lozinka"), + ("remember_password_tip", ""), ("Please enter your password", "Molimo unesite svoju lozinku"), ("Remember password", "Zapamti lozinku"), ("Wrong Password", "Pogrešna lozinka"), @@ -480,12 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", ""), ("show_monitors_tip", ""), ("View Mode", ""), - ("enter_rustdesk_passwd_tip", ""), - ("remember_rustdesk_passwd_tip", ""), ("login_linux_tip", ""), - ("login_linux_tooltip_tip", ""), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), - ("remember_password_tip", ""), + ("os_account_desk_tip", ""), + ("OS Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sv.rs b/src/lang/sv.rs index 496c882bc..df5caee28 100644 --- a/src/lang/sv.rs +++ b/src/lang/sv.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "Stäng"), ("Retry", "Försök igen"), ("OK", "OK"), - ("remember_password_tip", "Lösenord krävs"), + ("remember_password_tip", ""), ("Please enter your password", "Skriv in ditt lösenord"), ("Remember password", "Kom ihåg lösenord"), ("Wrong Password", "Fel lösenord"), @@ -480,12 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", ""), ("show_monitors_tip", ""), ("View Mode", ""), - ("enter_rustdesk_passwd_tip", ""), - ("remember_rustdesk_passwd_tip", ""), ("login_linux_tip", ""), - ("login_linux_tooltip_tip", ""), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), - ("remember_password_tip", ""), + ("os_account_desk_tip", ""), + ("OS Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/template.rs b/src/lang/template.rs index 6ec149289..1b8bf69c2 100644 --- a/src/lang/template.rs +++ b/src/lang/template.rs @@ -480,11 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", ""), ("show_monitors_tip", ""), ("View Mode", ""), - ("enter_rustdesk_passwd_tip", ""), - ("remember_rustdesk_passwd_tip", ""), ("login_linux_tip", ""), - ("login_linux_tooltip_tip", ""), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), + ("os_account_desk_tip", ""), + ("OS Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/th.rs b/src/lang/th.rs index 92ae279c9..a152eb7b1 100644 --- a/src/lang/th.rs +++ b/src/lang/th.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "ปิด"), ("Retry", "ลองใหม่อีกครั้ง"), ("OK", "ตกลง"), - ("remember_password_tip", "ต้องใช้รหัสผ่าน"), + ("remember_password_tip", ""), ("Please enter your password", "กรุณาใส่รหัสผ่านของคุณ"), ("Remember password", "จดจำรหัสผ่าน"), ("Wrong Password", "รหัสผ่านไม่ถูกต้อง"), @@ -480,12 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", ""), ("show_monitors_tip", ""), ("View Mode", ""), - ("enter_rustdesk_passwd_tip", ""), - ("remember_rustdesk_passwd_tip", ""), ("login_linux_tip", ""), - ("login_linux_tooltip_tip", ""), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), - ("remember_password_tip", ""), + ("os_account_desk_tip", ""), + ("OS Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/tr.rs b/src/lang/tr.rs index b423a021b..c5d21460a 100644 --- a/src/lang/tr.rs +++ b/src/lang/tr.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "Kapat"), ("Retry", "Tekrar Dene"), ("OK", "Tamam"), - ("remember_password_tip", "Şifre Gerekli"), + ("remember_password_tip", ""), ("Please enter your password", "Lütfen şifrenizi giriniz"), ("Remember password", "Şifreyi hatırla"), ("Wrong Password", "Hatalı şifre"), @@ -480,12 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", ""), ("show_monitors_tip", ""), ("View Mode", ""), - ("enter_rustdesk_passwd_tip", ""), - ("remember_rustdesk_passwd_tip", ""), ("login_linux_tip", ""), - ("login_linux_tooltip_tip", ""), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), - ("remember_password_tip", ""), + ("os_account_desk_tip", ""), + ("OS Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/tw.rs b/src/lang/tw.rs index e8685747e..d2156f4b7 100644 --- a/src/lang/tw.rs +++ b/src/lang/tw.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "關閉"), ("Retry", "重試"), ("OK", "確定"), - ("remember_password_tip", "需要密碼"), + ("remember_password_tip", ""), ("Please enter your password", "請輸入您的密碼"), ("Remember password", "記住密碼"), ("Wrong Password", "密碼錯誤"), @@ -480,12 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", "此檔案與對方的檔案一致"), ("show_monitors_tip", "在工具列中顯示顯示器"), ("View Mode", "瀏覽模式"), - ("enter_rustdesk_passwd_tip", "輸入 RustDesk 密碼"), - ("remember_rustdesk_passwd_tip", "記住 RustDesk 密碼"), - ("login_linux_tip", "登入到遠端 Linux 使用者帳戶"), - ("login_linux_tooltip_tip", "需要登入到遠端 Linux 使用者帳戶才能啟用 X 介面。"), + ("login_linux_tip", "需要登入到遠端 Linux 使用者帳戶才能啟用 X 介面。"), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), - ("remember_password_tip", ""), + ("os_account_desk_tip", ""), + ("OS Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ua.rs b/src/lang/ua.rs index 952c36b13..1a91bb879 100644 --- a/src/lang/ua.rs +++ b/src/lang/ua.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "Закрити"), ("Retry", "Спробувати знову"), ("OK", "ОК"), - ("remember_password_tip", "Потрібен пароль"), + ("remember_password_tip", ""), ("Please enter your password", "Будь ласка, введіть ваш пароль"), ("Remember password", "Запам'ятати пароль"), ("Wrong Password", "Невірний пароль"), @@ -480,12 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", ""), ("show_monitors_tip", ""), ("View Mode", ""), - ("enter_rustdesk_passwd_tip", ""), - ("remember_rustdesk_passwd_tip", ""), ("login_linux_tip", ""), - ("login_linux_tooltip_tip", ""), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), - ("remember_password_tip", ""), + ("os_account_desk_tip", ""), + ("OS Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/vn.rs b/src/lang/vn.rs index ab1aa2820..eeafcfa54 100644 --- a/src/lang/vn.rs +++ b/src/lang/vn.rs @@ -68,7 +68,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Close", "Đóng"), ("Retry", "Thử lại"), ("OK", "OK"), - ("remember_password_tip", "Yêu cầu mật khẩu"), + ("remember_password_tip", ""), ("Please enter your password", "Mời nhập mật khẩu"), ("Remember password", "Nhớ mật khẩu"), ("Wrong Password", "Sai mật khẩu"), @@ -480,12 +480,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("identical_file_tip", ""), ("show_monitors_tip", ""), ("View Mode", ""), - ("enter_rustdesk_passwd_tip", ""), - ("remember_rustdesk_passwd_tip", ""), ("login_linux_tip", ""), - ("login_linux_tooltip_tip", ""), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), - ("remember_password_tip", ""), + ("os_account_desk_tip", ""), + ("OS Account", ""), ].iter().cloned().collect(); }