mirror of
https://github.com/rustdesk/rustdesk.git
synced 2026-04-17 12:31:29 +03:00
Fix conflicts
This commit is contained in:
@@ -204,7 +204,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
|
||||
("Warning", "Uyarı"),
|
||||
("Login screen using Wayland is not supported", "Wayland kullanan giriş ekranı desteklenmiyor"),
|
||||
("Reboot required", "Yeniden başlatma gerekli"),
|
||||
("Unsupported display server ", "Desteklenmeyen görüntü sunucusu"),
|
||||
("Unsupported display server", "Desteklenmeyen görüntü sunucusu"),
|
||||
("x11 expected", "x11 bekleniyor"),
|
||||
("Port", "Port"),
|
||||
("Settings", "Ayarlar"),
|
||||
@@ -461,6 +461,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
|
||||
("Resolution", ""),
|
||||
("No transfers in progress", ""),
|
||||
("Set one-time password length", ""),
|
||||
("idd_driver_tip", ""),
|
||||
("confirm_idd_driver_tip", ""),
|
||||
("RDP Settings", ""),
|
||||
("Sort by", ""),
|
||||
].iter().cloned().collect();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user