opt connection close

Signed-off-by: 21pages <pages21@163.com>

src/client.rs

@@ -2083,6 +2083,7 @@ pub fn check_if_retry(msgtype: &str, title: &str, text: &str, retry_for_relay: b
                 && !text.to_lowercase().contains("mismatch")
                 && !text.to_lowercase().contains("manually")
                 && !text.to_lowercase().contains("not allowed")
+                && !text.to_lowercase().contains("as expected")
                 && !text.to_lowercase().contains("reset by the peer")))
 }
 

src/lang/ca.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", ""),
         ("Group", ""),
         ("Search", ""),
-        ("Closed manually by the web console", ""),
+        ("Closed manually by web console", ""),
         ("Local keyboard type", ""),
         ("Select local keyboard type", ""),
         ("software_render_tip", ""),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", ""),
         ("Switch Sides", ""),
         ("Please confirm if you want to share your desktop?", ""),
+        ("Closed as expected", ""),
     ].iter().cloned().collect();
 }

src/lang/cn.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", "添加到地址簿"),
         ("Group", "小组"),
         ("Search", "搜索"),
-        ("Closed manually by the web console", "被web控制台手动关闭"),
+        ("Closed manually by web console", "被web控制台手动关闭"),
         ("Local keyboard type", "本地键盘类型"),
         ("Select local keyboard type", "请选择本地键盘类型"),
         ("software_render_tip", "如果你使用英伟达显卡, 并且远程窗口在会话建立后会立刻关闭, 那么安装nouveau驱动并且选择使用软件渲染可能会有帮助。重启软件后生效。"),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", "强"),
         ("Switch Sides", "反转访问方向"),
         ("Please confirm if you want to share your desktop?", "请确认要让对方访问你的桌面?"),
+        ("Closed as expected", "正常关闭"),
     ].iter().cloned().collect();
 }

src/lang/cs.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", ""),
         ("Group", ""),
         ("Search", ""),
-        ("Closed manually by the web console", ""),
+        ("Closed manually by web console", ""),
         ("Local keyboard type", ""),
         ("Select local keyboard type", ""),
         ("software_render_tip", ""),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", ""),
         ("Switch Sides", ""),
         ("Please confirm if you want to share your desktop?", ""),
+        ("Closed as expected", ""),
     ].iter().cloned().collect();
 }

src/lang/da.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", ""),
         ("Group", ""),
         ("Search", ""),
-        ("Closed manually by the web console", ""),
+        ("Closed manually by web console", ""),
         ("Local keyboard type", ""),
         ("Select local keyboard type", ""),
         ("software_render_tip", ""),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", ""),
         ("Switch Sides", ""),
         ("Please confirm if you want to share your desktop?", ""),
+        ("Closed as expected", ""),
     ].iter().cloned().collect();
 }

src/lang/de.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", "Zum Adressbuch hinzufügen"),
         ("Group", "Gruppe"),
         ("Search", "Suchen"),
-        ("Closed manually by the web console", "Manuell über die Webkonsole beendet"),
+        ("Closed manually by web console", "Manuell über die Webkonsole beendet"),
         ("Local keyboard type", "Lokaler Tastaturtyp"),
         ("Select local keyboard type", "Lokalen Tastaturtyp auswählen"),
         ("software_render_tip", "Wenn Sie eine Nvidia-Grafikkarte haben und sich das entfernte Fenster sofort nach dem Herstellen der Verbindung schließt, kann es helfen, den Nouveau-Treiber zu installieren und Software-Rendering zu verwenden. Ein Neustart der Software ist erforderlich."),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", "Stark"),
         ("Switch Sides", "Seiten wechseln"),
         ("Please confirm if you want to share your desktop?", "Bitte bestätigen Sie, ob Sie Ihren Desktop freigeben möchten."),
+        ("Closed as expected", ""),
     ].iter().cloned().collect();
 }

src/lang/eo.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", ""),
         ("Group", ""),
         ("Search", ""),
-        ("Closed manually by the web console", ""),
+        ("Closed manually by web console", ""),
         ("Local keyboard type", ""),
         ("Select local keyboard type", ""),
         ("software_render_tip", ""),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", ""),
         ("Switch Sides", ""),
         ("Please confirm if you want to share your desktop?", ""),
+        ("Closed as expected", ""),
     ].iter().cloned().collect();
 }

src/lang/es.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", "Añadir a la libreta de direcciones"),
         ("Group", "Grupo"),
         ("Search", "Búsqueda"),
-        ("Closed manually by the web console", "Cerrado manualmente por la consola web"),
+        ("Closed manually by web console", "Cerrado manualmente por la consola web"),
         ("Local keyboard type", "Tipo de teclado local"),
         ("Select local keyboard type", "Seleccionar tipo de teclado local"),
         ("software_render_tip", "Si tienes una gráfica Nvidia y la ventana remota se cierra inmediatamente, instalar el driver nouveau y elegir renderizado por software podría ayudar. Se requiere reiniciar la aplicación."),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", "Fuerte"),
         ("Switch Sides", "Intercambiar lados"),
         ("Please confirm if you want to share your desktop?", "Por favor, confirma si quieres compartir tu escritorio"),
+        ("Closed as expected", ""),
     ].iter().cloned().collect();
 }

src/lang/fa.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", "افزودن به دفترچه آدرس"),
         ("Group", "گروه"),
         ("Search", "جستجو"),
-        ("Closed manually by the web console", "به صورت دستی توسط کنسول وب بسته شد"),
+        ("Closed manually by web console", "به صورت دستی توسط کنسول وب بسته شد"),
         ("Local keyboard type", "نوع صفحه کلید محلی"),
         ("Select local keyboard type", "نوع صفحه کلید محلی را انتخاب کنید"),
         ("software_render_tip", "اگر کارت گرافیک Nvidia دارید و پنجره راه دور بلافاصله پس از اتصال بسته می شود، درایور nouveau را نصب نمایید و انتخاب گزینه استفاده از رندر نرم افزار می تواند کمک کننده باشد. راه اندازی مجدد نرم افزار مورد نیاز است."),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", "قوی"),
         ("Switch Sides", "طرفین را عوض کنید"),
         ("Please confirm if you want to share your desktop?", "لطفاً تأیید کنید که آیا می خواهید دسکتاپ خود را به اشتراک بگذارید؟"),
+        ("Closed as expected", ""),
     ].iter().cloned().collect();
 }

src/lang/fr.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", "Ajouter au carnet d'adresses"),
         ("Group", "Groupe"),
         ("Search", "Rechercher"),
-        ("Closed manually by the web console", "Fermé manuellement par la console Web"),
+        ("Closed manually by web console", "Fermé manuellement par la console Web"),
         ("Local keyboard type", "Disposition du clavier local"),
         ("Select local keyboard type", "Selectionner la disposition du clavier local"),
         ("software_render_tip", "Si vous avez une carte graphique NVIDIA et que la fenêtre distante se ferme immédiatement après la connexion, l'installation du pilote Nouveau et le choix d'utiliser le rendu du logiciel peuvent aider. Un redémarrage du logiciel est requis."),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", "Fort"),
         ("Switch Sides", "Inverser la prise de contrôle"),
         ("Please confirm if you want to share your desktop?", "Veuillez confirmer le partager de votre bureau ?"),
+        ("Closed as expected", ""),
     ].iter().cloned().collect();
 }

src/lang/gr.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", "Προσθήκη στο Βιβλίο Διευθύνσεων"),
         ("Group", "Ομάδα"),
         ("Search", "Αναζήτηση"),
-        ("Closed manually by the web console", "Κλειστό χειροκίνητα από την κονσόλα web"),
+        ("Closed manually by web console", "Κλειστό χειροκίνητα από την κονσόλα web"),
         ("Local keyboard type", "Τύπος τοπικού πληκτρολογίου"),
         ("Select local keyboard type", "Επιλογή τύπου τοπικού πληκτρολογίου"),
         ("software_render_tip", "Εάν έχετε κάρτα γραφικών Nvidia και το παράθυρο σύνδεσης κλείνει αμέσως μετά τη σύνδεση, η εγκατάσταση του προγράμματος οδήγησης nouveau και η επιλογή χρήσης της επιτάχυνσης γραφικών μέσω λογισμικού μπορεί να βοηθήσει. Απαιτείται επανεκκίνηση."),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", "Δυνατό"),
         ("Switch Sides", ""),
         ("Please confirm if you want to share your desktop?", ""),
+        ("Closed as expected", ""),
     ].iter().cloned().collect();
 }

src/lang/hu.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", ""),
         ("Group", ""),
         ("Search", ""),
-        ("Closed manually by the web console", ""),
+        ("Closed manually by web console", ""),
         ("Local keyboard type", ""),
         ("Select local keyboard type", ""),
         ("software_render_tip", ""),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", ""),
         ("Switch Sides", ""),
         ("Please confirm if you want to share your desktop?", ""),
+        ("Closed as expected", ""),
     ].iter().cloned().collect();
 }

src/lang/id.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", ""),
         ("Group", ""),
         ("Search", "Pencarian"),
-        ("Closed manually by the web console", ""),
+        ("Closed manually by web console", ""),
         ("Local keyboard type", ""),
         ("Select local keyboard type", ""),
         ("software_render_tip", ""),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", ""),
         ("Switch Sides", ""),
         ("Please confirm if you want to share your desktop?", ""),
+        ("Closed as expected", ""),
     ].iter().cloned().collect();
 }

src/lang/it.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", "Aggiungi alla rubrica"),
         ("Group", "Gruppo"),
         ("Search", "Cerca"),
-        ("Closed manually by the web console", "Chiudi manualmente dalla console Web"),
+        ("Closed manually by web console", "Chiudi manualmente dalla console Web"),
         ("Local keyboard type", "Tipo di tastiera locale"),
         ("Select local keyboard type", "Seleziona il tipo di tastiera locale"),
         ("software_render_tip", "Se si dispone di una scheda grafica Nvidia e la finestra remota si chiude immediatamente dopo la connessione, l'installazione del driver nouveau e la scelta di utilizzare il rendering software possono aiutare. È necessario un riavvio del software."),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", "Forte"),
         ("Switch Sides", "Cambia lato"),
         ("Please confirm if you want to share your desktop?", "Vuoi condividere il tuo desktop?"),
+        ("Closed as expected", ""),
     ].iter().cloned().collect();
 }

src/lang/ja.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", ""),
         ("Group", ""),
         ("Search", ""),
-        ("Closed manually by the web console", ""),
+        ("Closed manually by web console", ""),
         ("Local keyboard type", ""),
         ("Select local keyboard type", ""),
         ("software_render_tip", ""),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", ""),
         ("Switch Sides", ""),
         ("Please confirm if you want to share your desktop?", ""),
+        ("Closed as expected", ""),
     ].iter().cloned().collect();
 }

src/lang/ko.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", ""),
         ("Group", ""),
         ("Search", ""),
-        ("Closed manually by the web console", ""),
+        ("Closed manually by web console", ""),
         ("Local keyboard type", ""),
         ("Select local keyboard type", ""),
         ("software_render_tip", ""),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", ""),
         ("Switch Sides", ""),
         ("Please confirm if you want to share your desktop?", ""),
+        ("Closed as expected", ""),
     ].iter().cloned().collect();
 }

src/lang/kz.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", ""),
         ("Group", ""),
         ("Search", ""),
-        ("Closed manually by the web console", ""),
+        ("Closed manually by web console", ""),
         ("Local keyboard type", ""),
         ("Select local keyboard type", ""),
         ("software_render_tip", ""),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", ""),
         ("Switch Sides", ""),
         ("Please confirm if you want to share your desktop?", ""),
+        ("Closed as expected", ""),
     ].iter().cloned().collect();
 }

src/lang/pl.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", "Dodaj do Książki Adresowej"),
         ("Group", "Grypy"),
         ("Search", "Szukaj"),
-        ("Closed manually by the web console", ""),
+        ("Closed manually by web console", ""),
         ("Local keyboard type", ""),
         ("Select local keyboard type", ""),
         ("software_render_tip", ""),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", ""),
         ("Switch Sides", ""),
         ("Please confirm if you want to share your desktop?", ""),
+        ("Closed as expected", ""),
     ].iter().cloned().collect();
 }

src/lang/pt_PT.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", ""),
         ("Group", ""),
         ("Search", ""),
-        ("Closed manually by the web console", ""),
+        ("Closed manually by web console", ""),
         ("Local keyboard type", ""),
         ("Select local keyboard type", ""),
         ("software_render_tip", ""),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", ""),
         ("Switch Sides", ""),
         ("Please confirm if you want to share your desktop?", ""),
+        ("Closed as expected", ""),
     ].iter().cloned().collect();
 }

src/lang/ptbr.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", ""),
         ("Group", ""),
         ("Search", ""),
-        ("Closed manually by the web console", ""),
+        ("Closed manually by web console", ""),
         ("Local keyboard type", ""),
         ("Select local keyboard type", ""),
         ("software_render_tip", ""),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", ""),
         ("Switch Sides", ""),
         ("Please confirm if you want to share your desktop?", ""),
+        ("Closed as expected", ""),
     ].iter().cloned().collect();
 }

src/lang/ro.rs

@@ -39,6 +39,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Change ID", "Schimbă ID"),
         ("Website", "Site web"),
         ("About", "Despre"),
+        ("Slogan_tip", ""),
+        ("Privacy Statement", ""),
         ("Mute", "Fără sunet"),
         ("Audio Input", "Intrare audio"),
         ("Enhancements", "Îmbunătățiri"),
@@ -116,7 +118,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Good image quality", "Calitate bună a imaginii"),
         ("Balanced", "Calitate normală a imaginii"),
         ("Optimize reaction time", "Optimizează timpul de reacție"),
-        ("Custom", "Personalizare"),
+        ("Custom", "Personalizat"),
         ("Show remote cursor", "Afișează cursor la distanță"),
         ("Show quality monitor", "Afișează indicator de calitate"),
         ("Disable clipboard", "Dezactivează clipboard"),
@@ -208,6 +210,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Always connect via relay", "Se conectează mereu prin retransmisie"),
         ("whitelist_tip", "Doar adresele IP autorizate pot accesa acest dispozitiv"),
         ("Login", "Conectare"),
+        ("Verify", ""),
+        ("Remember me", ""),
+        ("Trust this device", ""),
+        ("Verification code", ""),
+        ("verification_tip", ""),
         ("Logout", "Deconectare"),
         ("Tags", "Etichetare"),
         ("Search ID", "Caută după ID"),
@@ -332,7 +339,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Scale adaptive", "Scală adaptivă"),
         ("General", "General"),
         ("Security", "Securitate"),
-        ("Account", "Cont"),
         ("Theme", "Temă"),
         ("Dark Theme", "Temă întunecată"),
         ("Dark", "Întunecat"),
@@ -345,7 +351,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Server", "Server"),
         ("Direct IP Access", "Acces direct IP"),
         ("Proxy", "Proxy"),
-        ("Port", "Port"),
         ("Apply", "Aplică"),
         ("Disconnect all devices?", "Vrei să deconectezi toate dispozitivele?"),
         ("Clear", "Golește"),
@@ -374,7 +379,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Other", "Altele"),
         ("Confirm before closing multiple tabs", "Confirmă înainte de a închide mai multe file"),
         ("Keyboard Settings", "Configurare tastatură"),
-        ("Custom", "Personalizat"),
         ("Full Access", "Acces total"),
         ("Screen Share", "Partajare ecran"),
         ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland necesită Ubuntu 21.04 sau o versiune superioară."),
@@ -397,5 +401,38 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Request access to your device", "Solicită acces la dispozitivul tău"),
         ("Hide connection management window", "Ascunde fereastra de gestionare a conexiunilor"),
         ("hide_cm_tip", "Permite ascunderea ferestrei de gestionare doar dacă accepți începerea sesiunilor folosind parola permanentă"),
+        ("wayland_experiment_tip", ""),
+        ("Right click to select tabs", ""),
+        ("Skipped", ""),
+        ("Add to Address Book", ""),
+        ("Group", ""),
+        ("Search", ""),
+        ("Closed manually by web console", ""),
+        ("Local keyboard type", ""),
+        ("Select local keyboard type", ""),
+        ("software_render_tip", ""),
+        ("Always use software rendering", ""),
+        ("config_input", ""),
+        ("request_elevation_tip", ""),
+        ("Wait", ""),
+        ("Elevation Error", ""),
+        ("Ask the remote user for authentication", ""),
+        ("Choose this if the remote account is administrator", ""),
+        ("Transmit the username and password of administrator", ""),
+        ("still_click_uac_tip", ""),
+        ("Request Elevation", ""),
+        ("wait_accept_uac_tip", ""),
+        ("Elevate successfully", ""),
+        ("uppercase", ""),
+        ("lowercase", ""),
+        ("digit", ""),
+        ("special character", ""),
+        ("length>=8", ""),
+        ("Weak", ""),
+        ("Medium", ""),
+        ("Strong", ""),
+        ("Switch Sides", ""),
+        ("Please confirm if you want to share your desktop?", ""),
+        ("Closed as expected", ""),
     ].iter().cloned().collect();
 }

src/lang/ru.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", "Добавить в адресную книгу"),
         ("Group", "Группа"),
         ("Search", "Поиск"),
-        ("Closed manually by the web console", "Закрыто вручную через веб-консоль"),
+        ("Closed manually by web console", "Закрыто вручную через веб-консоль"),
         ("Local keyboard type", "Тип локальной клавиатуры"),
         ("Select local keyboard type", "Выберите тип локальной клавиатуры"),
         ("software_render_tip", "Если у вас видеокарта Nvidia и удалённое окно закрывается сразу после подключения, может помочь установка драйвера Nouveau и выбор использования программной визуализации. Потребуется перезапуск."),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", "Стойкий"),
         ("Switch Sides", "Переключить стороны"),
         ("Please confirm if you want to share your desktop?", "Подтвердите, что хотите поделиться своим рабочим столом?"),
+        ("Closed as expected", ""),
     ].iter().cloned().collect();
 }

src/lang/sk.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", ""),
         ("Group", ""),
         ("Search", ""),
-        ("Closed manually by the web console", ""),
+        ("Closed manually by web console", ""),
         ("Local keyboard type", ""),
         ("Select local keyboard type", ""),
         ("software_render_tip", ""),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", ""),
         ("Switch Sides", ""),
         ("Please confirm if you want to share your desktop?", ""),
+        ("Closed as expected", ""),
     ].iter().cloned().collect();
 }

src/lang/sl.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", "Dodaj v adresar"),
         ("Group", "Skupina"),
         ("Search", "Iskanje"),
-        ("Closed manually by the web console", "Ročno zaprto iz spletne konzole"),
+        ("Closed manually by web console", "Ročno zaprto iz spletne konzole"),
         ("Local keyboard type", "Lokalna vrsta tipkovnice"),
         ("Select local keyboard type", "Izberite lokalno vrsto tipkovnice"),
         ("software_render_tip", ""),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", ""),
         ("Switch Sides", ""),
         ("Please confirm if you want to share your desktop?", ""),
+        ("Closed as expected", ""),
     ].iter().cloned().collect();
 }

src/lang/sq.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", ""),
         ("Group", ""),
         ("Search", ""),
-        ("Closed manually by the web console", ""),
+        ("Closed manually by web console", ""),
         ("Local keyboard type", ""),
         ("Select local keyboard type", ""),
         ("software_render_tip", ""),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", ""),
         ("Switch Sides", ""),
         ("Please confirm if you want to share your desktop?", ""),
+        ("Closed as expected", ""),
     ].iter().cloned().collect();
 }

src/lang/sr.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", "Dodaj u adresar"),
         ("Group", "Grupa"),
         ("Search", "Pretraga"),
-        ("Closed manually by the web console", ""),
+        ("Closed manually by web console", ""),
         ("Local keyboard type", ""),
         ("Select local keyboard type", ""),
         ("software_render_tip", ""),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", ""),
         ("Switch Sides", ""),
         ("Please confirm if you want to share your desktop?", ""),
+        ("Closed as expected", ""),
     ].iter().cloned().collect();
 }

src/lang/sv.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", ""),
         ("Group", ""),
         ("Search", ""),
-        ("Closed manually by the web console", ""),
+        ("Closed manually by web console", ""),
         ("Local keyboard type", ""),
         ("Select local keyboard type", ""),
         ("software_render_tip", ""),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", ""),
         ("Switch Sides", ""),
         ("Please confirm if you want to share your desktop?", ""),
+        ("Closed as expected", ""),
     ].iter().cloned().collect();
 }

src/lang/template.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", ""),
         ("Group", ""),
         ("Search", ""),
-        ("Closed manually by the web console", ""),
+        ("Closed manually by web console", ""),
         ("Local keyboard type", ""),
         ("Select local keyboard type", ""),
         ("software_render_tip", ""),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", ""),
         ("Switch Sides", ""),
         ("Please confirm if you want to share your desktop?", ""),
+        ("Closed as expected", ""),
     ].iter().cloned().collect();
 }

src/lang/th.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", "เพิ่มไปยังสมุดรายชื่อ"),
         ("Group", "กลุ่ม"),
         ("Search", "ค้นหา"),
-        ("Closed manually by the web console", "ถูกปิดโดยเว็บคอนโซล"),
+        ("Closed manually by web console", "ถูกปิดโดยเว็บคอนโซล"),
         ("Local keyboard type", "ประเภทคีย์บอร์ด"),
         ("Select local keyboard type", "เลือกประเภทคีย์บอร์ด"),
         ("software_render_tip", ""),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", ""),
         ("Switch Sides", ""),
         ("Please confirm if you want to share your desktop?", ""),
+        ("Closed as expected", ""),
     ].iter().cloned().collect();
 }

src/lang/tr.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", ""),
         ("Group", ""),
         ("Search", ""),
-        ("Closed manually by the web console", ""),
+        ("Closed manually by web console", ""),
         ("Local keyboard type", ""),
         ("Select local keyboard type", ""),
         ("software_render_tip", ""),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", ""),
         ("Switch Sides", ""),
         ("Please confirm if you want to share your desktop?", ""),
+        ("Closed as expected", ""),
     ].iter().cloned().collect();
 }

src/lang/tw.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", "添加到地址簿"),
         ("Group", "小組"),
         ("Search", "搜索"),
-        ("Closed manually by the web console", "被web控制台手動關閉"),
+        ("Closed manually by web console", "被web控制台手動關閉"),
         ("Local keyboard type", "本地鍵盤類型"),
         ("Select local keyboard type", "請選擇本地鍵盤類型"),
         ("software_render_tip", "如果你使用英偉達顯卡, 並且遠程窗口在會話建立後會立刻關閉, 那麼安裝nouveau驅動並且選擇使用軟件渲染可能會有幫助。重啟軟件後生效。"),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", "強"),
         ("Switch Sides", ""),
         ("Please confirm if you want to share your desktop?", ""),
+        ("Closed as expected", "正常關閉"),
     ].iter().cloned().collect();
 }

src/lang/ua.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", "Додати IP до Адресної книги"),
         ("Group", "Група"),
         ("Search", "Пошук"),
-        ("Closed manually by the web console", ""),
+        ("Closed manually by web console", ""),
         ("Local keyboard type", ""),
         ("Select local keyboard type", ""),
         ("software_render_tip", ""),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", ""),
         ("Switch Sides", ""),
         ("Please confirm if you want to share your desktop?", ""),
+        ("Closed as expected", ""),
     ].iter().cloned().collect();
 }

src/lang/vn.rs

@@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Add to Address Book", ""),
         ("Group", ""),
         ("Search", ""),
-        ("Closed manually by the web console", ""),
+        ("Closed manually by web console", ""),
         ("Local keyboard type", ""),
         ("Select local keyboard type", ""),
         ("software_render_tip", ""),
@@ -433,5 +433,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Strong", ""),
         ("Switch Sides", ""),
         ("Please confirm if you want to share your desktop?", ""),
+        ("Closed as expected", ""),
     ].iter().cloned().collect();
 }

src/server/connection.rs

@@ -101,7 +101,6 @@ pub struct Connection {
     lr: LoginRequest,
     last_recv_time: Arc<Mutex<Instant>>,
     chat_unanswered: bool,
-    close_manually: bool,
     #[allow(unused)]
     elevation_requested: bool,
     from_switch: bool,
@@ -200,7 +199,6 @@ impl Connection {
             lr: Default::default(),
             last_recv_time: Arc::new(Mutex::new(Instant::now())),
             chat_unanswered: false,
-            close_manually: false,
             elevation_requested: false,
             from_switch: false,
         };
@@ -271,7 +269,9 @@ impl Connection {
                             }
                         }
                         ipc::Data::Close => {
-                            conn.on_close_manually("connection manager", "peer").await;
+                            conn.chat_unanswered = false; // seen
+                            conn.send_close_reason_no_retry("").await;
+                            conn.on_close("connection manager", true).await;
                             break;
                         }
                         ipc::Data::ChatMessage{text} => {
@@ -411,7 +411,8 @@ impl Connection {
                 }
                 Ok(conns) = hbbs_rx.recv() => {
                     if conns.contains(&id) {
-                        conn.on_close_manually("web console", "web console").await;
+                        conn.send_close_reason_no_retry("Closed manually by web console").await;
+                        conn.on_close("web console", true).await;
                         break;
                     }
                 }
@@ -441,7 +442,8 @@ impl Connection {
                         Some(message::Union::Misc(m)) => {
                             match &m.union {
                                 Some(misc::Union::StopService(_)) => {
-                                    conn.on_close_manually("stop service", "peer").await;
+                                    conn.send_close_reason_no_retry("").await;
+                                    conn.on_close("stop service", true).await;
                                     break;
                                 }
                                 _ => {},
@@ -540,6 +542,9 @@ impl Connection {
             "action": "close",
         }));
         ALIVE_CONNS.lock().unwrap().retain(|&c| c != id);
+        if let Some(s) = conn.server.upgrade() {
+            s.write().unwrap().remove_connection(&conn.inner);
+        }
         log::info!("#{} connection loop exited", id);
     }
 
@@ -1583,7 +1588,8 @@ impl Connection {
                                 uuid.to_string().as_ref(),
                             ])
                             .ok();
-                            self.on_close_manually("switch sides", "peer");
+                            self.send_close_reason_no_retry("Closed as expected");
+                            self.on_close("switch sides", false);
                             return false;
                         }
                     }
@@ -1757,16 +1763,13 @@ impl Connection {
     }
 
     async fn on_close(&mut self, reason: &str, lock: bool) {
-        if let Some(s) = self.server.upgrade() {
-            s.write().unwrap().remove_connection(&self.inner);
-        }
         log::info!("#{} Connection closed: {}", self.inner.id(), reason);
         if lock && self.lock_after_session_end && self.keyboard {
             #[cfg(not(any(target_os = "android", target_os = "ios")))]
             lock_screen().await;
         }
         #[cfg(not(any(target_os = "android", target_os = "ios")))]
-        let data = if self.chat_unanswered && !self.close_manually {
+        let data = if self.chat_unanswered {
             ipc::Data::Disconnected
         } else {
             ipc::Data::Close
@@ -1777,15 +1780,17 @@ impl Connection {
         self.port_forward_socket.take();
     }
 
-    async fn on_close_manually(&mut self, close_from: &str, close_by: &str) {
-        self.close_manually = true;
+    // The `reason` should be consistent with `check_if_retry` if not empty
+    async fn send_close_reason_no_retry(&mut self, reason: &str) {
         let mut misc = Misc::new();
-        misc.set_close_reason(format!("Closed manually by the {}", close_by));
+        if reason.is_empty() {
+            misc.set_close_reason("Closed manually by the peer".to_string());
+        } else {
+            misc.set_close_reason(reason.to_string());
+        }
         let mut msg_out = Message::new();
         msg_out.set_misc(misc);
         self.send(msg_out).await;
-        self.on_close(&format!("Close requested from {}", close_from), false)
-            .await;
         SESSIONS.lock().unwrap().remove(&self.lr.my_id);
     }