TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-04-14 10:51:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts

Browse Source
This commit is contained in:
NicKoehler
2023-03-08 16:57:51 +01:00
parent 2724c16e34 f38f912c28
commit bcfb649815
52 changed files with 525 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/lang/ca.rs
View File

@@ -204,7 +204,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Warning", "Avís"),
("Login screen using Wayland is not supported", "La pantalla d'inici de sessió amb Wayland no és compatible"),
("Reboot required", "Cal reiniciar"),
("Unsupported display server ", "Servidor de visualització no compatible"),
("Unsupported display server", "Servidor de visualització no compatible"),
("x11 expected", "x11 necessari"),
("Port", ""),
("Settings", "Ajustaments"),
@@ -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();
}