Fix conflicts

This commit is contained in:
NicKoehler
2023-03-08 16:57:51 +01:00
52 changed files with 525 additions and 135 deletions

View File

@@ -204,7 +204,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Warning", "Avviso"),
("Login screen using Wayland is not supported", "La schermata di accesso non è supportata utilizzando Wayland"),
("Reboot required", "Riavvio necessario"),
("Unsupported display server ", "Display server non supportato"),
("Unsupported display server", "Display server non supportato"),
("x11 expected", "x11 necessario"),
("Port", "Porta"),
("Settings", "Impostazioni"),
@@ -460,7 +460,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Codec", "Codec"),
("Resolution", "Risoluzione"),
("No transfers in progress", "Nessun trasferimento in corso"),
("Set one-time password length", "Imposta lunghezza password monouso"),
("Set one-time password length", "Imposta la lunghezza della password monouso"),
("idd_driver_tip", ""),
("confirm_idd_driver_tip", ""),
("RDP Settings", "Imposta lunghezza password monouso"),
("Sort by", "Ordina per"),
].iter().cloned().collect();
}