diff --git a/src/client.rs b/src/client.rs index 72bdac53..3bd00db4 100644 --- a/src/client.rs +++ b/src/client.rs @@ -1926,8 +1926,8 @@ lazy_static::lazy_static! { use hbb_common::config::LINK_HEADLESS_LINUX_SUPPORT; let map = HashMap::from([(crate::server::LOGIN_MSG_DESKTOP_SESSION_NOT_READY, LoginErrorMsgBox{ msgtype: "session-login", - title: "session_not_ready_title_tip", - text: "session_not_ready_text_tip", + title: "", + text: "", link: "", try_again: true, }), (crate::server::LOGIN_MSG_DESKTOP_XSESSION_FAILED, LoginErrorMsgBox{ @@ -1937,33 +1937,33 @@ lazy_static::lazy_static! { link: "", try_again: true, }), (crate::server::LOGIN_MSG_DESKTOP_SESSION_ANOTHER_USER, LoginErrorMsgBox{ - msgtype: "info", + msgtype: "info-nocancel", title: "another_user_login_title_tip", text: "another_user_login_text_tip", link: "", try_again: false, }), (crate::server::LOGIN_MSG_DESKTOP_XORG_NOT_FOUND, LoginErrorMsgBox{ - msgtype: "info-nocancel-nocancel", + msgtype: "info-nocancel", title: "xorg_not_found_title_tip", text: "xorg_not_found_text_tip", link: LINK_HEADLESS_LINUX_SUPPORT, try_again: true, }), (crate::server::LOGIN_MSG_DESKTOP_NO_DESKTOP, LoginErrorMsgBox{ - msgtype: "info-nocancel-nocancel", + msgtype: "info-nocancel", title: "no_desktop_title_tip", text: "no_desktop_text_tip", link: LINK_HEADLESS_LINUX_SUPPORT, try_again: true, }), (crate::server::LOGIN_MSG_DESKTOP_SESSION_NOT_READY_PASSWORD_EMPTY, LoginErrorMsgBox{ msgtype: "session-login-password", - title: "session_unready_no_password_title_tip", - text: "session_unready_no_password_text_tip", + title: "session_not_ready_no_password_title_tip", + text: "session_not_ready_no_password_text_tip", link: "", try_again: true, }), (crate::server::LOGIN_MSG_DESKTOP_SESSION_NOT_READY_PASSWORD_WRONG, LoginErrorMsgBox{ msgtype: "session-login-re-password", - title: "session_unready_wrong_password_title_tip", - text: "session_unready_wrong_password_text_tip", + title: "session_not_ready_wrong_password_title_tip", + text: "session_not_ready_wrong_password_text_tip", link: "", try_again: true, }), (crate::server::LOGIN_MSG_NO_PASSWORD_ACCESS, LoginErrorMsgBox{ diff --git a/src/lang/ca.rs b/src/lang/ca.rs index 230a9730..f4a8a120 100644 --- a/src/lang/ca.rs +++ b/src/lang/ca.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/cn.rs b/src/lang/cn.rs index 7f0e4058..11b3144c 100644 --- a/src/lang/cn.rs +++ b/src/lang/cn.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", "记住此账户"), ("os_account_desk_tip", "在无显示器的环境下，此账户用于登录被控系统，并启用桌面"), ("OS Account", "系统账户"), - ("session_not_ready_title_tip", "桌面 session 未准备好"), - ("session_not_ready_text_tip", "请输入用户名密码"), - ("xsession_failed_title_tip", "用户名密码错误"), - ("xsession_failed_text_tip", "是否重试"), ("another_user_login_title_tip", "其他用户已登录"), ("another_user_login_text_tip", "断开"), ("xorg_not_found_title_tip", "Xorg 未安装"), ("xorg_not_found_text_tip", "请安装 Xorg"), ("no_desktop_title_tip", "desktop 未安装"), ("no_desktop_text_tip", "请安装 desktop"), - ("session_unready_no_password_title_tip", "桌面 session 未准备好"), - ("session_unready_no_password_text_tip", "请输入用户名密码和连接密码"), - ("session_unready_wrong_password_title_tip", "密码错误"), - ("session_unready_wrong_password_text_tip", "是否重试"), ].iter().cloned().collect(); } diff --git a/src/lang/cs.rs b/src/lang/cs.rs index 7237b7a7..acfbed63 100644 --- a/src/lang/cs.rs +++ b/src/lang/cs.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/da.rs b/src/lang/da.rs index f761832d..b165540e 100644 --- a/src/lang/da.rs +++ b/src/lang/da.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/de.rs b/src/lang/de.rs index e77ab938..64ac4d9d 100644 --- a/src/lang/de.rs +++ b/src/lang/de.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/el.rs b/src/lang/el.rs index 3703aad2..e7455104 100644 --- a/src/lang/el.rs +++ b/src/lang/el.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/en.rs b/src/lang/en.rs index e6499ea1..b20035dc 100644 --- a/src/lang/en.rs +++ b/src/lang/en.rs @@ -57,22 +57,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("enter_rustdesk_passwd_tip", "Enter RustDesk password"), ("remember_rustdesk_passwd_tip", "Remember RustDesk password"), ("login_linux_tip", "You need to login to remote Linux account to enable a X desktop session"), - ("verify_rustdesk_password_tip", "Veryfy RustDesk password"), + ("verify_rustdesk_password_tip", "Verify RustDesk password"), ("remember_account_tip", "Remember this account"), ("os_account_desk_tip", "This account is used to login the remote OS and enable the desktop session in headless"), - ("session_not_ready_title_tip", "Session is unready"), - ("session_not_ready_text_tip", "Input linux user/password"), - ("xsession_failed_title_tip", "Xsession username/password is wrong"), - ("xsession_failed_text_tip", "Do you want to enter again"), - ("another_user_login_title_tip", "Another user already login"), + ("another_user_login_title_tip", "Another user already logged in"), ("another_user_login_text_tip", "Disconnect"), ("xorg_not_found_title_tip", "Xorg not found"), ("xorg_not_found_text_tip", "Please install Xorg"), ("no_desktop_title_tip", "No desktop is avaliable"), ("no_desktop_text_tip", "Please install GNOME desktop"), - ("session_unready_no_password_title_tip", "Session is unready"), - ("session_unready_no_password_text_tip", "Input connection password and linux user/password"), - ("session_unready_wrong_password_title_tip", "Password is wrong"), - ("session_unready_wrong_password_text_tip", "Do you want to enter again"), ].iter().cloned().collect(); } diff --git a/src/lang/eo.rs b/src/lang/eo.rs index 645c8be7..435bc6b0 100644 --- a/src/lang/eo.rs +++ b/src/lang/eo.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/es.rs b/src/lang/es.rs index 7a672dfe..6207fac3 100644 --- a/src/lang/es.rs +++ b/src/lang/es.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/fa.rs b/src/lang/fa.rs index 281478bb..d78cc8b3 100644 --- a/src/lang/fa.rs +++ b/src/lang/fa.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/fr.rs b/src/lang/fr.rs index 1c412637..cd2a6c3c 100644 --- a/src/lang/fr.rs +++ b/src/lang/fr.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/hu.rs b/src/lang/hu.rs index 54710760..e8efc6aa 100644 --- a/src/lang/hu.rs +++ b/src/lang/hu.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/id.rs b/src/lang/id.rs index c896db6b..97cab077 100644 --- a/src/lang/id.rs +++ b/src/lang/id.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/it.rs b/src/lang/it.rs index 0d1b6914..1211ceb3 100644 --- a/src/lang/it.rs +++ b/src/lang/it.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ja.rs b/src/lang/ja.rs index b7cfaf40..cfe029cc 100644 --- a/src/lang/ja.rs +++ b/src/lang/ja.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ko.rs b/src/lang/ko.rs index 849fa7ff..9e1278c6 100644 --- a/src/lang/ko.rs +++ b/src/lang/ko.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/kz.rs b/src/lang/kz.rs index b7e242ea..a86d1c81 100644 --- a/src/lang/kz.rs +++ b/src/lang/kz.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/nl.rs b/src/lang/nl.rs index 6cd67995..329c4dd7 100644 --- a/src/lang/nl.rs +++ b/src/lang/nl.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/pl.rs b/src/lang/pl.rs index 52928975..afa07046 100644 --- a/src/lang/pl.rs +++ b/src/lang/pl.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/pt_PT.rs b/src/lang/pt_PT.rs index 0fcbd360..6a44584a 100644 --- a/src/lang/pt_PT.rs +++ b/src/lang/pt_PT.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ptbr.rs b/src/lang/ptbr.rs index 491b48a4..51ef174f 100644 --- a/src/lang/ptbr.rs +++ b/src/lang/ptbr.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ro.rs b/src/lang/ro.rs index 60d293e3..5de632ec 100644 --- a/src/lang/ro.rs +++ b/src/lang/ro.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ru.rs b/src/lang/ru.rs index 90be51f0..f813c4b2 100644 --- a/src/lang/ru.rs +++ b/src/lang/ru.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sk.rs b/src/lang/sk.rs index aec122f7..3b7f62b7 100644 --- a/src/lang/sk.rs +++ b/src/lang/sk.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sl.rs b/src/lang/sl.rs index 18bd8f44..2f050333 100755 --- a/src/lang/sl.rs +++ b/src/lang/sl.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sq.rs b/src/lang/sq.rs index 746eed96..453534a8 100644 --- a/src/lang/sq.rs +++ b/src/lang/sq.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sr.rs b/src/lang/sr.rs index 0a94fe10..e2728caa 100644 --- a/src/lang/sr.rs +++ b/src/lang/sr.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sv.rs b/src/lang/sv.rs index 25d3144d..802eff33 100644 --- a/src/lang/sv.rs +++ b/src/lang/sv.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/template.rs b/src/lang/template.rs index 1b4b6ff1..8941c00d 100644 --- a/src/lang/template.rs +++ b/src/lang/template.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/th.rs b/src/lang/th.rs index 2fe64b10..1bdece3b 100644 --- a/src/lang/th.rs +++ b/src/lang/th.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/tr.rs b/src/lang/tr.rs index 3a925942..99977515 100644 --- a/src/lang/tr.rs +++ b/src/lang/tr.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/tw.rs b/src/lang/tw.rs index 86e0dfb9..bff471b3 100644 --- a/src/lang/tw.rs +++ b/src/lang/tw.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ua.rs b/src/lang/ua.rs index 36b27089..755e7b04 100644 --- a/src/lang/ua.rs +++ b/src/lang/ua.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/vn.rs b/src/lang/vn.rs index 35c40a79..b8086f12 100644 --- a/src/lang/vn.rs +++ b/src/lang/vn.rs @@ -485,19 +485,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remember_account_tip", ""), ("os_account_desk_tip", ""), ("OS Account", ""), - ("session_not_ready_title_tip", ""), - ("session_not_ready_text_tip", ""), - ("xsession_failed_title_tip", ""), - ("xsession_failed_text_tip", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), ("xorg_not_found_text_tip", ""), ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), - ("session_unready_no_password_title_tip", ""), - ("session_unready_no_password_text_tip", ""), - ("session_unready_wrong_password_title_tip", ""), - ("session_unready_wrong_password_text_tip", ""), ].iter().cloned().collect(); } diff --git a/src/server/connection.rs b/src/server/connection.rs index 297ab18c..5eb3bb37 100644 --- a/src/server/connection.rs +++ b/src/server/connection.rs @@ -62,16 +62,16 @@ pub static CLICK_TIME: AtomicI64 = AtomicI64::new(0); pub static MOUSE_MOVE_TIME: AtomicI64 = AtomicI64::new(0); pub const LOGIN_MSG_DESKTOP_NOT_INITED: &str = "Desktop env is not inited"; -pub const LOGIN_MSG_DESKTOP_SESSION_NOT_READY: &str = "Desktop session unready"; +pub const LOGIN_MSG_DESKTOP_SESSION_NOT_READY: &str = "Desktop session not ready"; pub const LOGIN_MSG_DESKTOP_XSESSION_FAILED: &str = "Desktop xsession failed"; pub const LOGIN_MSG_DESKTOP_SESSION_ANOTHER_USER: &str = "Desktop session another user login"; pub const LOGIN_MSG_DESKTOP_XORG_NOT_FOUND: &str = "Desktop xorg not found"; // ls /usr/share/xsessions/ pub const LOGIN_MSG_DESKTOP_NO_DESKTOP: &str = "Desktop none"; pub const LOGIN_MSG_DESKTOP_SESSION_NOT_READY_PASSWORD_EMPTY: &str = - "Desktop session unready, password empty"; + "Desktop session not ready, password empty"; pub const LOGIN_MSG_DESKTOP_SESSION_NOT_READY_PASSWORD_WRONG: &str = - "Desktop session unready, password wrong"; + "Desktop session not ready, password wrong"; pub const LOGIN_MSG_PASSWORD_EMPTY: &str = "Empty Password"; pub const LOGIN_MSG_PASSWORD_WRONG: &str = "Wrong Password"; pub const LOGIN_MSG_NO_PASSWORD_ACCESS: &str = "No Password Access";