Fix conflicts

src/lang/es.rs

@@ -204,7 +204,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Warning", "Aviso"),
         ("Login screen using Wayland is not supported", "La pantalla de inicio de sesión con Wayland no es compatible"),
         ("Reboot required", "Reinicio requerido"),
-        ("Unsupported display server ", "Servidor de visualización no compatible"),
+        ("Unsupported display server", "Servidor de visualización no compatible"),
         ("x11 expected", "x11 necesario"),
         ("Port", "Puerto"),
         ("Settings", "Ajustes"),
@@ -461,6 +461,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Resolution", "Resolución"),
         ("No transfers in progress", "No hay transferencias en curso"),
         ("Set one-time password length", "Establecer contraseña de un solo uso"),
+        ("idd_driver_tip", ""),
+        ("confirm_idd_driver_tip", ""),
+        ("RDP Settings", ""),
         ("Sort by", ""),
     ].iter().cloned().collect();
 }