diff --git a/flutter/lib/models/ab_model.dart b/flutter/lib/models/ab_model.dart index bf638c767..e64759f91 100644 --- a/flutter/lib/models/ab_model.dart +++ b/flutter/lib/models/ab_model.dart @@ -105,9 +105,6 @@ class AbModel { if (!quiet) { pullError.value = '${translate('pull_ab_failed_tip')}: ${translate(err.toString())}'; - if (gFFI.peerTabModel.currentTab != PeerTabIndex.ab.index) { - BotToast.showText(contentColor: Colors.red, text: pullError.value); - } } } finally { abLoading.value = false; diff --git a/flutter/lib/models/group_model.dart b/flutter/lib/models/group_model.dart index 0b2174f9f..ddb02d370 100644 --- a/flutter/lib/models/group_model.dart +++ b/flutter/lib/models/group_model.dart @@ -133,7 +133,8 @@ class GroupModel { return true; } catch (err) { debugPrint('get accessible users: $err'); - groupLoadError.value = err.toString(); + groupLoadError.value = + '${translate('pull_group_failed_tip')}: ${translate(err.toString())}'; } return false; } @@ -198,7 +199,8 @@ class GroupModel { return true; } catch (err) { debugPrint('get accessible peers: $err'); - groupLoadError.value = err.toString(); + groupLoadError.value = + '${translate('pull_group_failed_tip')}: ${translate(err.toString())}'; } return false; } diff --git a/src/lang/ar.rs b/src/lang/ar.rs index d695c2ad5..3500e2916 100644 --- a/src/lang/ar.rs +++ b/src/lang/ar.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", ""), ("Check for software update on startup", ""), ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ca.rs b/src/lang/ca.rs index a047ee501..1fd7dff11 100644 --- a/src/lang/ca.rs +++ b/src/lang/ca.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", ""), ("Check for software update on startup", ""), ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/cn.rs b/src/lang/cn.rs index 989e962f3..00cdc9390 100644 --- a/src/lang/cn.rs +++ b/src/lang/cn.rs @@ -535,8 +535,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("List View", "列表视图"), ("Select", "选择"), ("Toggle Tags", "切换标签"), - ("pull_ab_failed_tip", "未成功获取地址簿"), - ("push_ab_failed_tip", "未成功上传地址簿"), + ("pull_ab_failed_tip", "获取地址簿失败"), + ("push_ab_failed_tip", "上传地址簿失败"), ("synced_peer_readded_tip", "最近会话中存在的设备将会被重新同步到地址簿。"), ("Change Color", "更改颜色"), ("Primary Color", "基本色"), @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", "由于长时间无操作, 连接被自动断开"), ("Check for software update on startup", "启动时检查软件更新"), ("upgrade_rustdesk_server_pro_to_{}_tip", "请升级专业版服务器到{}或更高版本!"), + ("pull_group_failed_tip", "获取组信息失败"), ].iter().cloned().collect(); } diff --git a/src/lang/cs.rs b/src/lang/cs.rs index fe2b9f3d7..cd7f3a306 100644 --- a/src/lang/cs.rs +++ b/src/lang/cs.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", ""), ("Check for software update on startup", ""), ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/da.rs b/src/lang/da.rs index b287056d1..7d1321890 100644 --- a/src/lang/da.rs +++ b/src/lang/da.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", ""), ("Check for software update on startup", ""), ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/de.rs b/src/lang/de.rs index 6bca2eefe..893882a8e 100644 --- a/src/lang/de.rs +++ b/src/lang/de.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", "Automatische Trennung der Verbindung aufgrund von Inaktivität"), ("Check for software update on startup", "Beim Start auf Softwareaktualisierung prüfen"), ("upgrade_rustdesk_server_pro_to_{}_tip", "Bitte aktualisieren Sie RustDesk Server Pro auf die Version {} oder neuer!"), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/el.rs b/src/lang/el.rs index d58d7b0ad..76327d0ea 100644 --- a/src/lang/el.rs +++ b/src/lang/el.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", ""), ("Check for software update on startup", ""), ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/en.rs b/src/lang/en.rs index 27e636a9d..7bedc3182 100644 --- a/src/lang/en.rs +++ b/src/lang/en.rs @@ -90,6 +90,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Decline", "Decline"), ("auto_disconnect_option_tip", "Automatically close incoming sessions on user inactivity"), ("Connection failed due to inactivity", "Automatically disconnected due to inactivity"), - ("upgrade_rustdesk_server_pro_to_{}_tip", "Please upgrade RustDesk Server Pro to version {} or newer!") + ("upgrade_rustdesk_server_pro_to_{}_tip", "Please upgrade RustDesk Server Pro to version {} or newer!"), + ("pull_group_failed_tip", "Failed to refresh group"), ].iter().cloned().collect(); } diff --git a/src/lang/eo.rs b/src/lang/eo.rs index 49fd95982..9b73932f2 100644 --- a/src/lang/eo.rs +++ b/src/lang/eo.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", ""), ("Check for software update on startup", ""), ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/es.rs b/src/lang/es.rs index 2ac738e4a..f3887cd8e 100644 --- a/src/lang/es.rs +++ b/src/lang/es.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", "Desconectar automáticamente por inactividad."), ("Check for software update on startup", "Comprobar actualización al iniciar"), ("upgrade_rustdesk_server_pro_to_{}_tip", "¡Por favor, actualiza RustDesk Server Pro a la versión {} o superior"), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/fa.rs b/src/lang/fa.rs index fca9610ce..25a526377 100644 --- a/src/lang/fa.rs +++ b/src/lang/fa.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", ""), ("Check for software update on startup", ""), ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/fr.rs b/src/lang/fr.rs index fec7f5bb7..4a28ede55 100644 --- a/src/lang/fr.rs +++ b/src/lang/fr.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", ""), ("Check for software update on startup", ""), ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/hu.rs b/src/lang/hu.rs index bb6d0e2cc..bb3388341 100644 --- a/src/lang/hu.rs +++ b/src/lang/hu.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", ""), ("Check for software update on startup", ""), ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/id.rs b/src/lang/id.rs index cce9df03b..4b109daf0 100644 --- a/src/lang/id.rs +++ b/src/lang/id.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", "Secara otomatis akan terputus ketik tidak ada aktivitas."), ("Check for software update on startup", "Periksa pembaruan aplikasi saat sistem dinyalakan."), ("upgrade_rustdesk_server_pro_to_{}_tip", "Silahkan perbarui RustDesk Server Pro ke versi {} atau yang lebih baru!"), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/it.rs b/src/lang/it.rs index 51e5dd05c..e1d0be88c 100644 --- a/src/lang/it.rs +++ b/src/lang/it.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", "Connessione non riuscita a causa di inattività"), ("Check for software update on startup", "All'avvio verifica presenza aggiornamenti programma"), ("upgrade_rustdesk_server_pro_to_{}_tip", "Aggiorna RustDesk Server Pro alla versione {} o successiva!"), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ja.rs b/src/lang/ja.rs index 712f68053..04b00dbfe 100644 --- a/src/lang/ja.rs +++ b/src/lang/ja.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", ""), ("Check for software update on startup", ""), ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ko.rs b/src/lang/ko.rs index 6d2c4f43c..4d8677c81 100644 --- a/src/lang/ko.rs +++ b/src/lang/ko.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", ""), ("Check for software update on startup", ""), ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/kz.rs b/src/lang/kz.rs index 2a6c3ef51..2eab96f76 100644 --- a/src/lang/kz.rs +++ b/src/lang/kz.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", ""), ("Check for software update on startup", ""), ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/lt.rs b/src/lang/lt.rs index 468396992..c2dece955 100644 --- a/src/lang/lt.rs +++ b/src/lang/lt.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", ""), ("Check for software update on startup", ""), ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/lv.rs b/src/lang/lv.rs index 26751f628..6163635a8 100644 --- a/src/lang/lv.rs +++ b/src/lang/lv.rs @@ -559,5 +559,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", "Automātiski atvienots neaktivitātes dēļ"), ("Check for software update on startup", "Startējot pārbaudīt, vai nav programmatūras atjauninājumu"), ("upgrade_rustdesk_server_pro_to_{}_tip", "Lūdzu, jauniniet RustDesk Server Pro uz versiju {} vai jaunāku!"), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/nl.rs b/src/lang/nl.rs index 33ffb7a8e..b879a896c 100644 --- a/src/lang/nl.rs +++ b/src/lang/nl.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", ""), ("Check for software update on startup", ""), ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/pl.rs b/src/lang/pl.rs index db2db9366..223692073 100644 --- a/src/lang/pl.rs +++ b/src/lang/pl.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", "Automatycznie rozłącz przy bezczynności"), ("Check for software update on startup", "Sprawdź aktualizacje przy starcie programu"), ("upgrade_rustdesk_server_pro_to_{}_tip", "Proszę zaktualizować RustDesk Server Pro do wersji {} lub nowszej!"), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/pt_PT.rs b/src/lang/pt_PT.rs index f0e26387e..f540bc76d 100644 --- a/src/lang/pt_PT.rs +++ b/src/lang/pt_PT.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", ""), ("Check for software update on startup", ""), ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ptbr.rs b/src/lang/ptbr.rs index 7c76a6507..719886a18 100644 --- a/src/lang/ptbr.rs +++ b/src/lang/ptbr.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", ""), ("Check for software update on startup", ""), ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ro.rs b/src/lang/ro.rs index 35c5358a8..b347278fc 100644 --- a/src/lang/ro.rs +++ b/src/lang/ro.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", ""), ("Check for software update on startup", ""), ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ru.rs b/src/lang/ru.rs index a6547bc8f..0a647b3ce 100644 --- a/src/lang/ru.rs +++ b/src/lang/ru.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", "Подключение не выполнено из-за неактивности"), ("Check for software update on startup", "Проверять обновления программы при запуске"), ("upgrade_rustdesk_server_pro_to_{}_tip", "Обновите RustDesk Server Pro до версии {} или новее!"), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sk.rs b/src/lang/sk.rs index c25dc377c..05c3160fd 100644 --- a/src/lang/sk.rs +++ b/src/lang/sk.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", ""), ("Check for software update on startup", ""), ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sl.rs b/src/lang/sl.rs index 60d8e113b..c22b2ecd1 100755 --- a/src/lang/sl.rs +++ b/src/lang/sl.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", ""), ("Check for software update on startup", ""), ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sq.rs b/src/lang/sq.rs index 56a13621e..d0875114d 100644 --- a/src/lang/sq.rs +++ b/src/lang/sq.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", ""), ("Check for software update on startup", ""), ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sr.rs b/src/lang/sr.rs index f8d8c4edd..13819f37e 100644 --- a/src/lang/sr.rs +++ b/src/lang/sr.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", ""), ("Check for software update on startup", ""), ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sv.rs b/src/lang/sv.rs index c09f02a25..e54b7c7b6 100644 --- a/src/lang/sv.rs +++ b/src/lang/sv.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", ""), ("Check for software update on startup", ""), ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/template.rs b/src/lang/template.rs index 962cda2d9..e442c826e 100644 --- a/src/lang/template.rs +++ b/src/lang/template.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", ""), ("Check for software update on startup", ""), ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/th.rs b/src/lang/th.rs index 2913ba116..2629540d2 100644 --- a/src/lang/th.rs +++ b/src/lang/th.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", ""), ("Check for software update on startup", ""), ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/tr.rs b/src/lang/tr.rs index 3f5c1c56e..20a1ce942 100644 --- a/src/lang/tr.rs +++ b/src/lang/tr.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", ""), ("Check for software update on startup", ""), ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/tw.rs b/src/lang/tw.rs index 0a8efc8bb..0074e8afb 100644 --- a/src/lang/tw.rs +++ b/src/lang/tw.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", ""), ("Check for software update on startup", ""), ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ua.rs b/src/lang/ua.rs index 8fba30edb..facada5f1 100644 --- a/src/lang/ua.rs +++ b/src/lang/ua.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", ""), ("Check for software update on startup", ""), ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/vn.rs b/src/lang/vn.rs index 4d9fc6f18..9eec26b0c 100644 --- a/src/lang/vn.rs +++ b/src/lang/vn.rs @@ -556,5 +556,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection failed due to inactivity", ""), ("Check for software update on startup", ""), ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), ].iter().cloned().collect(); }