diff --git a/libs/hbb_common/src/proxy.rs b/libs/hbb_common/src/proxy.rs index 93d4257b1..83e109eb8 100644 --- a/libs/hbb_common/src/proxy.rs +++ b/libs/hbb_common/src/proxy.rs @@ -1,4 +1,3 @@ - use std::io::{Error as IoError}; use std::net::{SocketAddr, ToSocketAddrs}; @@ -16,7 +15,7 @@ use tokio_socks::tcp::Socks5Stream; use tokio_util::codec::Framed; use url::Url; use crate::config::Socks5Server; -use crate::{ ResultType}; +use crate::{ResultType}; use crate::bytes_codec::BytesCodec; use crate::tcp::{DynTcpStream, FramedStream}; @@ -263,6 +262,7 @@ impl IntoProxyScheme for S { Ok(ok) => ok, Err(e) => { match e { + // If the string does not contain protocol headers, try to parse it using the socks5 protocol ProxyError::UrlParseScheme(_source) => { let try_this = format!("socks5://{}", self.as_str()); try_this.into_url()? @@ -298,17 +298,17 @@ impl Proxy { } pub fn is_http_or_https(&self) -> bool { - return match self.intercept { - ProxyScheme::Socks5 {..} => false, - _=> true - } + return match self.intercept { + ProxyScheme::Socks5 { .. } => false, + _ => true + }; } pub fn form_conf(conf: &Socks5Server, ms_timeout: Option) -> Result { let mut proxy; match ms_timeout { - None => {proxy= Self::new(&conf.proxy, DEFINE_TIME_OUT)?;} - Some(time_out) => {proxy= Self::new(&conf.proxy, time_out)?;} + None => { proxy = Self::new(&conf.proxy, DEFINE_TIME_OUT)?; } + Some(time_out) => { proxy = Self::new(&conf.proxy, time_out)?; } } if !conf.password.is_empty() && !conf.username.is_empty() { @@ -326,8 +326,8 @@ impl Proxy { self } - pub async fn connect<'t, T>(self,target: T, - local_addr: Option) -> ResultType + pub async fn connect<'t, T>(self, target: T, + local_addr: Option) -> ResultType where T: IntoTargetAddr<'t>, { info!("Connect to proxy server"); @@ -341,7 +341,7 @@ impl Proxy { let stream = super::timeout(self.ms_timeout, - crate::tcp::new_socket(local, true)?.connect(proxy)).await??; + crate::tcp::new_socket(local, true)?.connect(proxy)).await??; stream.set_nodelay(true).ok(); let addr = stream.local_addr()?; @@ -354,8 +354,8 @@ impl Proxy { self.http_connect(stream, target), ).await??; Ok(FramedStream( - Framed::new(DynTcpStream(Box::new(stream)), BytesCodec::new()), - addr, None, 0, + Framed::new(DynTcpStream(Box::new(stream)), BytesCodec::new()), + addr, None, 0, )) } ProxyScheme::Https { .. } => { @@ -403,7 +403,7 @@ impl Proxy { pub async fn http_connect<'a, Input, T>(self, io: Input, target: T) -> Result, ProxyError> where - Input: AsyncRead + AsyncWrite + Unpin, T: IntoTargetAddr<'a> { + Input: AsyncRead + AsyncWrite + Unpin, T: IntoTargetAddr<'a> { let mut stream = BufStream::new(io); let (domain, port) = get_domain_and_port(target)?; @@ -461,9 +461,7 @@ async fn get_response(stream: &mut BufStream) -> Result( - stream: &mut BufStream -) -> Result<(), ProxyError> +async fn recv_and_check_response(stream: &mut BufStream) -> Result<(), ProxyError> where IO: AsyncRead + AsyncWrite + Unpin, { diff --git a/src/lang/ar.rs b/src/lang/ar.rs index 9879bc235..56795e55b 100644 --- a/src/lang/ar.rs +++ b/src/lang/ar.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "فارغ"), ("Invalid folder name", "اسم المجلد غير صحيح"), ("Socks5 Proxy", "وكيل Socks5"), + ("Socks5/Http(s) Proxy", "وكيل Socks5/Http(s)"), ("Discovered", "المكتشفة"), ("install_daemon_tip", "للبدء مع بدء تشغيل النظام. تحتاج الى تثبيت خدمة النظام."), ("Remote ID", "المعرف البعيد"), diff --git a/src/lang/bg.rs b/src/lang/bg.rs index c7675e119..84cf93f9e 100644 --- a/src/lang/bg.rs +++ b/src/lang/bg.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", ""), ("Invalid folder name", ""), ("Socks5 Proxy", "Socks5 прокси"), + ("Socks5/Http(s) Proxy", "Socks5/Http(s) прокси"), ("Discovered", ""), ("install_daemon_tip", "За стартиране с компютъра трябва да инсталирате системна услуга."), ("Remote ID", ""), diff --git a/src/lang/ca.rs b/src/lang/ca.rs index fb5eb449d..7b54f28eb 100644 --- a/src/lang/ca.rs +++ b/src/lang/ca.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "Buit"), ("Invalid folder name", "Nom de carpeta incorrecte"), ("Socks5 Proxy", "Proxy Socks5"), + ("Socks5/Http(s) Proxy", "Proxy Socks5/Http(s)"), ("Discovered", "Descobert"), ("install_daemon_tip", ""), ("Remote ID", "ID remot"), diff --git a/src/lang/cn.rs b/src/lang/cn.rs index 0ac1981ec..323220435 100644 --- a/src/lang/cn.rs +++ b/src/lang/cn.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "空空如也"), ("Invalid folder name", "无效文件夹名称"), ("Socks5 Proxy", "Socks5 代理"), + ("Socks5/Http(s) Proxy", "Socks5/Http(s) 代理"), ("Discovered", "已发现"), ("install_daemon_tip", "为了开机启动,请安装系统服务。"), ("Remote ID", "远程 ID"), diff --git a/src/lang/cs.rs b/src/lang/cs.rs index a00a5da31..d877242f0 100644 --- a/src/lang/cs.rs +++ b/src/lang/cs.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "Prázdné"), ("Invalid folder name", "Neplatný název složky"), ("Socks5 Proxy", "Socks5 proxy"), + ("Socks5/Http(s) Proxy", "Socks5/Http(s) proxy"), ("Discovered", "Objeveno"), ("install_daemon_tip", "Pokud má být spouštěno při startu systému, je třeba nainstalovat systémovou službu."), ("Remote ID", "Vzdálené ID"), diff --git a/src/lang/da.rs b/src/lang/da.rs index 043207f19..581380e3a 100644 --- a/src/lang/da.rs +++ b/src/lang/da.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "Tom"), ("Invalid folder name", "Ugyldigt mappenavn"), ("Socks5 Proxy", "Socks5 Proxy"), + ("Socks5/Http(s) Proxy", "Socks5/Http(s) Proxy"), ("Discovered", "Fundet"), ("install_daemon_tip", "For at starte efter PC'en er startet op, skal du installere systemtjenesten"), ("Remote ID", "Fjern-ID"), diff --git a/src/lang/de.rs b/src/lang/de.rs index ae186dfa7..19b0c0640 100644 --- a/src/lang/de.rs +++ b/src/lang/de.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "Keine Einträge"), ("Invalid folder name", "Ungültiger Ordnername"), ("Socks5 Proxy", "SOCKS5-Proxy"), + ("Socks5/Http(s) Proxy", "Socks5/Http(s)-Proxy"), ("Discovered", "Im LAN erkannt"), ("install_daemon_tip", "Um mit System zu starten, muss der Systemdienst installiert sein."), ("Remote ID", "Entfernte ID"), diff --git a/src/lang/el.rs b/src/lang/el.rs index 9950d10d7..510946bea 100644 --- a/src/lang/el.rs +++ b/src/lang/el.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "Άδειο"), ("Invalid folder name", "Μη έγκυρο όνομα φακέλου"), ("Socks5 Proxy", "Διαμεσολαβητής Socks5"), + ("Socks5/Http(s) Proxy", "Διαμεσολαβητής Socks5/Http(s)"), ("Discovered", "Ανακαλύφθηκαν"), ("install_daemon_tip", "Για να ξεκινά με την εκκίνηση του υπολογιστή, πρέπει να εγκαταστήσετε την υπηρεσία συστήματος"), ("Remote ID", "Απομακρυσμένο ID"), diff --git a/src/lang/en.rs b/src/lang/en.rs index 31c2eabb7..57b9b8ace 100644 --- a/src/lang/en.rs +++ b/src/lang/en.rs @@ -60,6 +60,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Add to Favorites", "Add to favorites"), ("Remove from Favorites", "Remove from favorites"), ("Socks5 Proxy", "Socks5 proxy"), + ("Socks5/Http(s) Proxy", "Socks5/Http(s) proxy"), ("install_daemon_tip", "For starting on boot, you need to install system service."), ("Are you sure to close the connection?", "Are you sure you want to close the connection?"), ("One-Finger Tap", "One-finger tap"), diff --git a/src/lang/eo.rs b/src/lang/eo.rs index ee6d61ac5..0ddd3d6af 100644 --- a/src/lang/eo.rs +++ b/src/lang/eo.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "Malplena"), ("Invalid folder name", "Dosiernomo nevalida"), ("Socks5 Proxy", "Socks5 prokura servilo"), + ("Socks5/Http(s) Proxy", "Socks5/Http(s) prokura servilo"), ("Discovered", "Malkovritaj"), ("install_daemon_tip", ""), ("Remote ID", "Fora identigilo"), diff --git a/src/lang/es.rs b/src/lang/es.rs index 8d9307746..383653009 100644 --- a/src/lang/es.rs +++ b/src/lang/es.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "Vacío"), ("Invalid folder name", "Nombre de carpeta incorrecto"), ("Socks5 Proxy", "Proxy Socks5"), + ("Socks5/Http(s) Proxy", "Proxy Socks5/Http(s)"), ("Discovered", "Descubierto"), ("install_daemon_tip", "Para comenzar en el encendido, debe instalar el servicio del sistema."), ("Remote ID", "ID remoto"), diff --git a/src/lang/et.rs b/src/lang/et.rs index b04e364a7..de859d6ed 100644 --- a/src/lang/et.rs +++ b/src/lang/et.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", ""), ("Invalid folder name", ""), ("Socks5 Proxy", "Socks5 proksi"), + ("Socks5/Http(s) Proxy", "Socks5/Http(s) proksi"), ("Discovered", ""), ("install_daemon_tip", "Süsteemikäivitusel käivitamiseks tuleb paigaldada süsteemiteenus."), ("Remote ID", ""), diff --git a/src/lang/fa.rs b/src/lang/fa.rs index ef818f0ab..87fb3b844 100644 --- a/src/lang/fa.rs +++ b/src/lang/fa.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "موردی وجود ندارد"), ("Invalid folder name", "نام پوشه نامعتبر است"), ("Socks5 Proxy", "Socks5 پروکسی"), + ("Socks5/Http(s) Proxy", "Socks5/Http(s) پروکسی"), ("Discovered", "پیدا شده"), ("install_daemon_tip", "برای شروع در هنگام راه اندازی، باید سرویس سیستم را نصب کنید"), ("Remote ID", "شناسه راه دور"), diff --git a/src/lang/fr.rs b/src/lang/fr.rs index 22d9c0c16..4fa303da4 100644 --- a/src/lang/fr.rs +++ b/src/lang/fr.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "Vide"), ("Invalid folder name", "Nom de dossier invalide"), ("Socks5 Proxy", "Socks5 Agents"), + ("Socks5/Http(s) Proxy", "Socks5/Http(s) Agents"), ("Discovered", "Découvert"), ("install_daemon_tip", "Pour une exécution au démarrage du système, vous devez installer le service système."), ("Remote ID", "ID de l'appareil distant"), diff --git a/src/lang/he.rs b/src/lang/he.rs index ff54ba0e8..1ac8aae1f 100644 --- a/src/lang/he.rs +++ b/src/lang/he.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", ""), ("Invalid folder name", ""), ("Socks5 Proxy", "פרוקסי Socks5"), + ("Socks5/Http(s) Proxy", "פרוקסי Socks5/Http(s)"), ("Discovered", ""), ("install_daemon_tip", "לצורך הפעלה בעת הפעלת המחשב, עליך להתקין שירות מערכת."), ("Remote ID", ""), diff --git a/src/lang/hu.rs b/src/lang/hu.rs index 19cc91227..1e68523ee 100644 --- a/src/lang/hu.rs +++ b/src/lang/hu.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "Üres"), ("Invalid folder name", "Helytelen mappa név"), ("Socks5 Proxy", "Socks5 Proxy"), + ("Socks5/Http(s) Proxy", "Socks5/Http(s) Proxy"), ("Discovered", "Felfedezett"), ("install_daemon_tip", "Az automatikus indításhoz szükséges a szolgáltatás telepítése"), ("Remote ID", "Távoli azonosító"), diff --git a/src/lang/id.rs b/src/lang/id.rs index 57bc2bfaf..97e6660c4 100644 --- a/src/lang/id.rs +++ b/src/lang/id.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "Kosong"), ("Invalid folder name", "Nama folder tidak valid"), ("Socks5 Proxy", "Proksi Socks5"), + ("Socks5/Http(s) Proxy", "Proksi Socks5/Http(s)"), ("Discovered", "Telah ditemukan"), ("install_daemon_tip", "Untuk memulai saat boot, Anda perlu menginstal system service."), ("Remote ID", "ID Remote"), diff --git a/src/lang/it.rs b/src/lang/it.rs index 4ad013481..c0594fa7b 100644 --- a/src/lang/it.rs +++ b/src/lang/it.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "Vuoto"), ("Invalid folder name", "Nome della cartella non valido"), ("Socks5 Proxy", "Proxy Socks5"), + ("Socks5/Http(s) Proxy", "Proxy Socks5/Http(s)"), ("Discovered", "Rilevate"), ("install_daemon_tip", "Per avviare il programma all'accensione, è necessario installarlo come servizio di sistema."), ("Remote ID", "ID remoto"), diff --git a/src/lang/ja.rs b/src/lang/ja.rs index 20f142c8b..ea9754e47 100644 --- a/src/lang/ja.rs +++ b/src/lang/ja.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "空"), ("Invalid folder name", "無効なフォルダ名"), ("Socks5 Proxy", "SOCKS5プロキシ"), + ("Socks5/Http(s) Proxy", "Socks5/Http(s)プロキシ"), ("Discovered", "探知済み"), ("install_daemon_tip", "起動時に開始するには、システムサービスをインストールする必要があります。"), ("Remote ID", "リモートのID"), diff --git a/src/lang/ko.rs b/src/lang/ko.rs index 91d8529c8..faba24ae3 100644 --- a/src/lang/ko.rs +++ b/src/lang/ko.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "비어 있음"), ("Invalid folder name", "유효하지 않은 폴더명"), ("Socks5 Proxy", "Socks5 프록시"), + ("Socks5/Http(s) Proxy", "Socks5/Http(s) 프록시"), ("Discovered", "찾음"), ("install_daemon_tip", "부팅된 이후 시스템 서비스에 설치해야 합니다."), ("Remote ID", "원격 ID"), diff --git a/src/lang/kz.rs b/src/lang/kz.rs index 0dae8c601..f8e042194 100644 --- a/src/lang/kz.rs +++ b/src/lang/kz.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "Бос"), ("Invalid folder name", "Бұрыс бума атауы"), ("Socks5 Proxy", "Socks5 Proxy"), + ("Socks5/Http(s) Proxy", "Socks5/Http(s) Proxy"), ("Discovered", "Табылды"), ("install_daemon_tip", "Бут кезінде қосылу үшін жүйелік сербесті орнатуыныз керек."), ("Remote ID", "Қашықтағы ID"), diff --git a/src/lang/lt.rs b/src/lang/lt.rs index 5511cea37..6e6d040f6 100644 --- a/src/lang/lt.rs +++ b/src/lang/lt.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "Tuščia"), ("Invalid folder name", "Neteisingas aplanko pavadinimas"), ("Socks5 Proxy", "Socks5 Proxy"), + ("Socks5/Http(s) Proxy", "Socks5/Http(s) Proxy"), ("Discovered", "Aptikta tinkle"), ("install_daemon_tip", "Norėdami, kad RustDesk startuotų automatiškai, turite ją įdiegti"), ("Remote ID", "Nuotolinis ID"), diff --git a/src/lang/lv.rs b/src/lang/lv.rs index 49ee9f5ed..b1b6a3e00 100644 --- a/src/lang/lv.rs +++ b/src/lang/lv.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "Tukšs"), ("Invalid folder name", "Nederīgs mapes nosaukums"), ("Socks5 Proxy", "Socks5 starpniekserveris"), + ("Socks5/Http(s) Proxy", "Socks5/Http(s) starpniekserveris"), ("Discovered", "Atklāts"), ("install_daemon_tip", "Lai palaistu pie startēšanas, ir jāinstalē sistēmas serviss."), ("Remote ID", "Attālais ID"), diff --git a/src/lang/nb.rs b/src/lang/nb.rs index 6764dff9c..7df5ddaec 100644 --- a/src/lang/nb.rs +++ b/src/lang/nb.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "Tom"), ("Invalid folder name", "Ugyldig mappenavn"), ("Socks5 Proxy", "Socks5 Proxy"), + ("Socks5/Http(s) Proxy", "Socks5/Http(s) Proxy"), ("Discovered", "Oppdaget"), ("install_daemon_tip", "For å starte når PC'en har startet opp, må du installere systemtjenesten"), ("Remote ID", "Fjern-ID"), diff --git a/src/lang/nl.rs b/src/lang/nl.rs index 4b7998824..687707748 100644 --- a/src/lang/nl.rs +++ b/src/lang/nl.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "Leeg"), ("Invalid folder name", "Ongeldige mapnaam"), ("Socks5 Proxy", "Socks5 Proxy"), + ("Socks5/Http(s) Proxy", "Socks5/Http(s) Proxy"), ("Discovered", "Ontdekt"), ("install_daemon_tip", "Om bij het opstarten van de computer te kunnen beginnen, moet u de systeemservice installeren."), ("Remote ID", "Externe ID"), diff --git a/src/lang/pl.rs b/src/lang/pl.rs index 1fe6e19d1..4f1f9c453 100644 --- a/src/lang/pl.rs +++ b/src/lang/pl.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "Pusto"), ("Invalid folder name", "Nieprawidłowa nazwa folderu"), ("Socks5 Proxy", "Proxy Socks5"), + ("Socks5/Http(s) Proxy", "Proxy Socks5/Http(s)"), ("Discovered", "Wykryte"), ("install_daemon_tip", "By uruchomić RustDesk przy starcie systemu, musisz zainstalować usługę systemową."), ("Remote ID", "Zdalne ID"), diff --git a/src/lang/pt_PT.rs b/src/lang/pt_PT.rs index 6c875b36c..7bdec3e70 100644 --- a/src/lang/pt_PT.rs +++ b/src/lang/pt_PT.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "Vazio"), ("Invalid folder name", "Nome de diretório inválido"), ("Socks5 Proxy", "Proxy Socks5"), + ("Socks5/Http(s) Proxy", "Proxy Socks5/Http(s)"), ("Discovered", "Descoberto"), ("install_daemon_tip", "Para inicialização junto do sistema, deve instalar o serviço de sistema."), ("Remote ID", "ID Remoto"), diff --git a/src/lang/ptbr.rs b/src/lang/ptbr.rs index fd1b85c13..16f5a8d2b 100644 --- a/src/lang/ptbr.rs +++ b/src/lang/ptbr.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "Vazio"), ("Invalid folder name", "Nome de diretório inválido"), ("Socks5 Proxy", "Proxy Socks5"), + ("Socks5/Http(s) Proxy", "Proxy Socks5/Http(s)"), ("Discovered", "Descoberto"), ("install_daemon_tip", "Para inicialização junto ao sistema, você deve instalar o serviço de sistema."), ("Remote ID", "ID Remoto"), diff --git a/src/lang/ro.rs b/src/lang/ro.rs index e300c3c8a..638270182 100644 --- a/src/lang/ro.rs +++ b/src/lang/ro.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "Gol"), ("Invalid folder name", "Denumire folder nevalidă"), ("Socks5 Proxy", "Proxy Socks5"), + ("Socks5/Http(s) Proxy", "Proxy Socks5/Http(s)"), ("Discovered", "Descoperite"), ("install_daemon_tip", "Pentru executare la pornirea sistemului, instalează serviciul de sistem."), ("Remote ID", "ID dispozitiv la distanță"), diff --git a/src/lang/ru.rs b/src/lang/ru.rs index 2b1e06b69..89b3d4f0f 100644 --- a/src/lang/ru.rs +++ b/src/lang/ru.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "Пусто"), ("Invalid folder name", "Недопустимое имя папки"), ("Socks5 Proxy", "SOCKS5-прокси"), + ("Socks5/Http(s) Proxy", "Socks5/Http(s)-прокси"), ("Discovered", "Найдено"), ("install_daemon_tip", "Для запуска при загрузке необходимо установить системную службу"), ("Remote ID", "Удалённый ID"), diff --git a/src/lang/sk.rs b/src/lang/sk.rs index 63fc86a0c..361857832 100644 --- a/src/lang/sk.rs +++ b/src/lang/sk.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "Prázdne"), ("Invalid folder name", "Neplatný názov adresára"), ("Socks5 Proxy", "Socks5 Proxy"), + ("Socks5/Http(s) Proxy", "Socks5/Http(s) Proxy"), ("Discovered", "Objavené"), ("install_daemon_tip", "Ak chcete, aby sa spúšťal pri štarte systému, musíte nainštalovať systémovú službu."), ("Remote ID", "Vzdialené ID"), diff --git a/src/lang/sl.rs b/src/lang/sl.rs index 2a70acb10..d80fce177 100755 --- a/src/lang/sl.rs +++ b/src/lang/sl.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "Prazno"), ("Invalid folder name", "Napačno ime mape"), ("Socks5 Proxy", "Socks5 posredniški strežnik"), + ("Socks5/Http(s) Proxy", "Socks5/Http(s) posredniški strežnik"), ("Discovered", "Odkriti"), ("install_daemon_tip", "Za samodejni zagon ob vklopu računalnika je potrebno dodati sistemsko storitev"), ("Remote ID", "Oddaljeni ID"), diff --git a/src/lang/sq.rs b/src/lang/sq.rs index 4ef83a044..99dd9d534 100644 --- a/src/lang/sq.rs +++ b/src/lang/sq.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "Bosh"), ("Invalid folder name", "Emri i dosjes i pavlefshëm"), ("Socks5 Proxy", "Socks5 Proxy"), + ("Socks5/Http(s) Proxy", "Socks5/Http(s) Proxy"), ("Discovered", "I pambuluar"), ("install_daemon_tip", "Për të nisur në boot, duhet të instaloni shërbimin e sistemit"), ("Remote ID", "ID në distancë"), diff --git a/src/lang/sr.rs b/src/lang/sr.rs index e89794082..90410d00c 100644 --- a/src/lang/sr.rs +++ b/src/lang/sr.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "Prazno"), ("Invalid folder name", "Pogrešno ime direktorijuma"), ("Socks5 Proxy", "Socks5 proksi"), + ("Socks5/Http(s) Proxy", "Socks5/Http(s) proksi"), ("Discovered", "Otkriveno"), ("install_daemon_tip", "Za pokretanje pri startu sistema, treba da instalirate sistemski servis."), ("Remote ID", "Udaljeni ID"), diff --git a/src/lang/sv.rs b/src/lang/sv.rs index afd699432..0440869bf 100644 --- a/src/lang/sv.rs +++ b/src/lang/sv.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "Tom"), ("Invalid folder name", "Ogiltigt mappnamn"), ("Socks5 Proxy", "Socks5 Proxy"), + ("Socks5/Http(s) Proxy", "Socks5/Http(s) Proxy"), ("Discovered", "Upptäckt"), ("install_daemon_tip", "För att starta efter boot måste du installera systemtjänsten."), ("Remote ID", "Fjärr ID"), diff --git a/src/lang/template.rs b/src/lang/template.rs index 22ecb6342..8d0035ff9 100644 --- a/src/lang/template.rs +++ b/src/lang/template.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", ""), ("Invalid folder name", ""), ("Socks5 Proxy", ""), + ("Socks5/Http(s) Proxy", ""), ("Discovered", ""), ("install_daemon_tip", ""), ("Remote ID", ""), diff --git a/src/lang/th.rs b/src/lang/th.rs index 808cc659a..c1511de08 100644 --- a/src/lang/th.rs +++ b/src/lang/th.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "ว่างเปล่า"), ("Invalid folder name", "ชื่อโฟลเดอร์ไม่ถูกต้อง"), ("Socks5 Proxy", "พรอกซี Socks5"), + ("Socks5/Http(s) Proxy", "พรอกซี Socks5/Http(s)"), ("Discovered", "ค้นพบ"), ("install_daemon_tip", "หากต้องการใช้งานขณะระบบเริ่มต้น คุณจำเป็นจะต้องติดตั้งเซอร์วิส"), ("Remote ID", "ID ปลายทาง"), diff --git a/src/lang/tr.rs b/src/lang/tr.rs index 40894ff3e..32dfeb217 100644 --- a/src/lang/tr.rs +++ b/src/lang/tr.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "Boş"), ("Invalid folder name", "Geçersiz klasör adı"), ("Socks5 Proxy", "Socks5 Proxy"), + ("Socks5/Http(s) Proxy", "Socks5/Http(s) Proxy"), ("Discovered", "Keşfedilenler"), ("install_daemon_tip", "Başlangıçta başlamak için sistem hizmetini yüklemeniz gerekir."), ("Remote ID", "Uzak ID"), diff --git a/src/lang/tw.rs b/src/lang/tw.rs index 9b5a38120..555fec87c 100644 --- a/src/lang/tw.rs +++ b/src/lang/tw.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "空空如也"), ("Invalid folder name", "資料夾名稱無效"), ("Socks5 Proxy", "Socks5 代理伺服器"), + ("Socks5/Http(s) Proxy", "Socks5/Http(s) 代理伺服器"), ("Discovered", "已探索"), ("install_daemon_tip", "若要在開機時啟動,您需要安裝系統服務。"), ("Remote ID", "遠端 ID"), diff --git a/src/lang/ua.rs b/src/lang/ua.rs index 86d08d547..8a0155b1b 100644 --- a/src/lang/ua.rs +++ b/src/lang/ua.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "Пусто"), ("Invalid folder name", "Неприпустима назва теки"), ("Socks5 Proxy", "Проксі-сервер Socks5"), + ("Socks5/Http(s) Proxy", "Проксі-сервер Socks5/Http(s)"), ("Discovered", "Знайдено"), ("install_daemon_tip", "Для запуску під час завантаження, вам необхідно встановити системну службу"), ("Remote ID", "Віддалений ідентифікатор"), diff --git a/src/lang/vn.rs b/src/lang/vn.rs index 9f2043037..a106ba967 100644 --- a/src/lang/vn.rs +++ b/src/lang/vn.rs @@ -239,6 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Empty", "Trống"), ("Invalid folder name", "Tên thư mục không hợp lệ"), ("Socks5 Proxy", "Proxy Socks5"), + ("Socks5/Http(s) Proxy", "Proxy Socks5/Http(s)"), ("Discovered", "Đuợc phát hiện"), ("install_daemon_tip", "Để chạy lúc khởi động máy, bạn cần phải cài dịch vụ hệ thống."), ("Remote ID", "ID từ xa"),