From 955c55b6cc5f993d5cc6beb228e9a3211c44dd2e Mon Sep 17 00:00:00 2001 From: rustdesk Date: Sun, 7 Jan 2024 13:25:19 +0800 Subject: [PATCH] fix code merge --- src/lang/cn.rs | 5 ----- src/lang/cs.rs | 5 ----- src/lang/fa.rs | 7 ------- src/lang/it.rs | 5 ----- src/lang/lv.rs | 5 ----- src/lang/nl.rs | 5 ----- src/lang/ru.rs | 5 ----- src/lang/sk.rs | 5 ----- 8 files changed, 42 deletions(-) diff --git a/src/lang/cn.rs b/src/lang/cn.rs index f796ff873..006a3b07c 100644 --- a/src/lang/cn.rs +++ b/src/lang/cn.rs @@ -578,13 +578,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("capture_display_elevated_connections_tip", "用户提权后，不能显示多个显示器。若要控制多显示器，请安装后再试。"), ("Swap control-command key", "交换Control键和Command键"), ("swap-left-right-mouse", "交换鼠标左右键"), -<<<<<<< Updated upstream ("2FA code", "双重认证代码"), ("2fa_tip", "请输入授权 app 中的双重认证代码"), -======= - ("2FA code", "2FA code"), - ("2fa_tip", "请输入授权 app 中的 2FA code"), ("More", ""), ->>>>>>> Stashed changes ].iter().cloned().collect(); } diff --git a/src/lang/cs.rs b/src/lang/cs.rs index 41dc81961..b7c04758a 100644 --- a/src/lang/cs.rs +++ b/src/lang/cs.rs @@ -578,13 +578,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("capture_display_elevated_connections_tip", "Snímání více displejů není podporováno v uživatelském režimu se zvýšenými oprávněními. Pokud chcete ovládat více displejů, zkuste to znovu po instalaci."), ("Swap control-command key", "Prohození klávesy control-command"), ("swap-left-right-mouse", "Prohodit levé a pravé tlačítko myši"), -<<<<<<< Updated upstream ("2FA code", "2FA kód"), ("2fa_tip", "Zadejte svůj kód 2FA do ověřovací aplikace."), -======= - ("2FA code", ""), - ("2fa_tip", ""), ("More", ""), ->>>>>>> Stashed changes ].iter().cloned().collect(); } diff --git a/src/lang/fa.rs b/src/lang/fa.rs index 1b758fc3a..0441b389f 100644 --- a/src/lang/fa.rs +++ b/src/lang/fa.rs @@ -576,17 +576,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("input_source_1_tip", "منبع ورودی 1"), ("input_source_2_tip", "منبع ورودی 2"), ("capture_display_elevated_connections_tip", ""), -<<<<<<< Updated upstream ("Swap control-command key", "گرفتن چندین نمایشگر در حالت کاربر زیاد پشتیبانی نمی شود. اگر می‌خواهید چند نمایشگر را کنترل کنید، لطفاً پس از نصب دوباره امتحان کنید."), ("swap-left-right-mouse", "دکمه چپ و راست ماوس را عوض کنید"), ("2FA code", "کد ورود 2 مرحله ای"), ("2fa_tip", "لطفا کد ورود 2 مرحله ای خود را در برنامه احراز هویت وارد کنید"), -======= - ("Swap control-command key", ""), - ("swap-left-right-mouse", ""), - ("2FA code", ""), - ("2fa_tip", ""), ("More", ""), ->>>>>>> Stashed changes ].iter().cloned().collect(); } diff --git a/src/lang/it.rs b/src/lang/it.rs index b00b0c29d..d3c7d41ce 100644 --- a/src/lang/it.rs +++ b/src/lang/it.rs @@ -578,13 +578,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("capture_display_elevated_connections_tip", "La cattura di più display non è supportata nella modalità utente con privilegi elevati. Se vuoi controllare più display riprova dopo l'installazione."), ("Swap control-command key", "Scambia tasto controllo-comando"), ("swap-left-right-mouse", "Scambia pulsante sinistro-destro mouse"), -<<<<<<< Updated upstream ("2FA code", "Codice 2FA"), ("2fa_tip", "Inserisci il codice 2FA nell'app di autenticazione."), -======= - ("2FA code", ""), - ("2fa_tip", ""), ("More", ""), ->>>>>>> Stashed changes ].iter().cloned().collect(); } diff --git a/src/lang/lv.rs b/src/lang/lv.rs index 4a6886e01..29e1677df 100644 --- a/src/lang/lv.rs +++ b/src/lang/lv.rs @@ -578,13 +578,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("capture_display_elevated_connections_tip", "Vairāku displeju uzņemšana netiek atbalstīta paaugstinātā lietotāja režīmā. Lūdzu, mēģiniet vēlreiz pēc instalēšanas, ja vēlaties kontrolēt vairākus displejus."), ("Swap control-command key", "Apmainīt vadības un komandas taustiņu"), ("swap-left-right-mouse", "Apmainīt kreiso un labo peles pogu"), -<<<<<<< Updated upstream ("2FA code", "2FA kods"), ("2fa_tip", "Lūdzu, ievadiet savu 2FA kodu autentifikācijas lietotnē."), -======= - ("2FA code", ""), - ("2fa_tip", ""), ("More", ""), ->>>>>>> Stashed changes ].iter().cloned().collect(); } diff --git a/src/lang/nl.rs b/src/lang/nl.rs index 90e939009..cc447b2af 100644 --- a/src/lang/nl.rs +++ b/src/lang/nl.rs @@ -578,13 +578,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("capture_display_elevated_connections_tip", "Scannen van meerdere schermen wordt niet ondersteund in de bevoorrechte gebruikersmodus. Als je meerdere schermen wilt bedienen, probeer het dan opnieuw na de installatie."), ("Swap control-command key", "Wissel controle-commando toets"), ("swap-left-right-mouse", "wissel-links-rechts-muis"), -<<<<<<< Updated upstream ("2FA code", "2FA-code"), ("2fa_tip", "Geef je 2FA-code op in de verificatie-app."), -======= - ("2FA code", ""), - ("2fa_tip", ""), ("More", ""), ->>>>>>> Stashed changes ].iter().cloned().collect(); } diff --git a/src/lang/ru.rs b/src/lang/ru.rs index c9b33db27..710e77b5e 100644 --- a/src/lang/ru.rs +++ b/src/lang/ru.rs @@ -578,13 +578,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("capture_display_elevated_connections_tip", "Захват экрана нескольких дисплеев не поддерживается в режиме повышенных прав. Повторите попытку после установки, если хотите управлять несколькими дисплеями."), ("Swap control-command key", "Поменять кнопки управления и команд"), ("swap-left-right-mouse", "Поменять левую и правую кнопки мыши"), -<<<<<<< Updated upstream ("2FA code", "Код 2FA"), ("2fa_tip", "Введите код двухфакторной аутентификации из приложения для аутентификации."), -======= - ("2FA code", ""), - ("2fa_tip", ""), ("More", ""), ->>>>>>> Stashed changes ].iter().cloned().collect(); } diff --git a/src/lang/sk.rs b/src/lang/sk.rs index c16f57ea6..8f1f3f21d 100644 --- a/src/lang/sk.rs +++ b/src/lang/sk.rs @@ -578,13 +578,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("capture_display_elevated_connections_tip", "Snímanie viacerých displejov nie je podporované v režime privilegovaného používateľa. Ak chcete ovládať viac displejov, skúste to po inštalácii znova."), ("Swap control-command key", "Vymeniť kláves ovládania a príkazu"), ("swap-left-right-mouse", "Prehodiť ľavé a pravé tlačidlo myši"), -<<<<<<< Updated upstream ("2FA code", "2FA kód"), ("2fa_tip", "Zadajte svoj kód 2FA do aplikácie na overovanie."), -======= - ("2FA code", ""), - ("2fa_tip", ""), ("More", ""), ->>>>>>> Stashed changes ].iter().cloned().collect(); }