Some fixes and update french language (#46)

* Fix starred homebrew list logging, fix hbmenu identification when backing up it and logging it correctly, update french language.

Signed-off-by: shadow2560 <24191064+shadow2560@users.noreply.github.com>
This commit is contained in:
shadow2560
2024-12-24 23:21:54 +01:00
committed by GitHub
parent 3df676df0f
commit a2c9b63dfd
3 changed files with 45 additions and 3 deletions

View File

@@ -14,7 +14,11 @@
"Info": "Info.", "Info": "Info.",
"Install": "Installer", "Install": "Installer",
"Delete": "Supprimer", "Delete": "Supprimer",
<<<<<<< HEAD
"Restart": "Redémarrer",
=======
"Restart": "", "Restart": "",
>>>>>>> 3df676df0f432112aa14fbeae26943c91690e829
"Changelog": "Changelog", "Changelog": "Changelog",
"Details": "Détails", "Details": "Détails",
"Update": "Mise à jour", "Update": "Mise à jour",
@@ -38,6 +42,15 @@
"Order": "Ordre", "Order": "Ordre",
"Search": "Recherche", "Search": "Recherche",
"Updated": "Mis à jour", "Updated": "Mis à jour",
<<<<<<< HEAD
"Updated (Star)": "Mis à jour (Favories)",
"Downloads": "Téléchargements",
"Size": "Taille",
"Size (Star)": "Taille (Favories)",
"Alphabetical": "Alphabétique",
"Alphabetical (Star)": "Alphabétique (Favories)",
"Likes": "Likes",
=======
"Updated (Star)": "", "Updated (Star)": "",
"Downloads": "Téléchargements", "Downloads": "Téléchargements",
"Size": "Taille", "Size": "Taille",
@@ -45,6 +58,7 @@
"Alphabetical": "Alphabétique", "Alphabetical": "Alphabétique",
"Alphabetical (Star)": "", "Alphabetical (Star)": "",
"Likes": "Favoris", "Likes": "Favoris",
>>>>>>> 3df676df0f432112aa14fbeae26943c91690e829
"ID": "ID", "ID": "ID",
"Decending": "Décroissant", "Decending": "Décroissant",
"Descending (down)": "Décroissant", "Descending (down)": "Décroissant",
@@ -66,8 +80,13 @@
"Nxlink Connected": "Nxlink Connecté", "Nxlink Connected": "Nxlink Connecté",
"Nxlink Upload": "Nxlink téléversement", "Nxlink Upload": "Nxlink téléversement",
"Nxlink Finished": "Nxlink terminé", "Nxlink Finished": "Nxlink terminé",
<<<<<<< HEAD
"Switch-Handheld!": "Switch-Portable",
"Switch-Docked!": "Switch-Dockée",
=======
"Switch-Handheld!": "", "Switch-Handheld!": "",
"Switch-Docked!": "", "Switch-Docked!": "",
>>>>>>> 3df676df0f432112aa14fbeae26943c91690e829
"Language": "Langue", "Language": "Langue",
"Auto": "Auto", "Auto": "Auto",
"English": "English", "English": "English",
@@ -114,9 +133,15 @@
"View as text (unfinished)": "Afficher sous forme de texte (inachevé)", "View as text (unfinished)": "Afficher sous forme de texte (inachevé)",
"Empty...": "Vide...", "Empty...": "Vide...",
"Open with DayBreak?": "Ouvrir avec DayBreak?", "Open with DayBreak?": "Ouvrir avec DayBreak?",
<<<<<<< HEAD
"Launch ": "Lancer ",
"Launch option for: ": "Option de lancement pour: ",
"Select launcher for: ": "Sélectionner le lanceur pour: ",
=======
"Launch ": "", "Launch ": "",
"Launch option for: ": "Option de lancement pour: ", "Launch option for: ": "Option de lancement pour: ",
"Select launcher for: ": "", "Select launcher for: ": "",
>>>>>>> 3df676df0f432112aa14fbeae26943c91690e829
"Homebrew": "Homebrew", "Homebrew": "Homebrew",
"Homebrew Options": "Options Homebrew", "Homebrew Options": "Options Homebrew",
@@ -157,7 +182,11 @@
"Controller": "Contrôleur", "Controller": "Contrôleur",
"Pad ": "Manette ", "Pad ": "Manette ",
" (Available)": " (Disponible)", " (Available)": " (Disponible)",
<<<<<<< HEAD
" (Unsupported)": "Non supporté",
=======
" (Unsupported)": "", " (Unsupported)": "",
>>>>>>> 3df676df0f432112aa14fbeae26943c91690e829
" (Unconnected)": " (Non connectée)", " (Unconnected)": " (Non connectée)",
"HandHeld": "Portable", "HandHeld": "Portable",
"Rotation": "Rotation", "Rotation": "Rotation",
@@ -209,7 +238,11 @@
"Scanning ": "Scan ", "Scanning ": "Scan ",
"Creating ": "Création ", "Creating ": "Création ",
"Copying ": "Copie ", "Copying ": "Copie ",
<<<<<<< HEAD
"Trying to load ": "Tente de charger ",
=======
"Trying to load ": "", "Trying to load ": "",
>>>>>>> 3df676df0f432112aa14fbeae26943c91690e829
"Downloading ": "Téléchargement ", "Downloading ": "Téléchargement ",
"Checking MD5": "Vérification MD5", "Checking MD5": "Vérification MD5",
"Loading...": "Chargement...", "Loading...": "Chargement...",
@@ -219,12 +252,21 @@
"Error loading page!": "Erreur du chargement de la page!", "Error loading page!": "Erreur du chargement de la page!",
"Update avaliable: ": "Mise à jour disponible: ", "Update avaliable: ": "Mise à jour disponible: ",
"Download update: ": "Télécharger la mise à jour: ", "Download update: ": "Télécharger la mise à jour: ",
<<<<<<< HEAD
"Updated to ": "Mis à jour vers ",
"Restart Sphaira?": "Redémarrer Sphaira?",
=======
"Updated to ": "", "Updated to ": "",
"Restart Sphaira?": "", "Restart Sphaira?": "",
>>>>>>> 3df676df0f432112aa14fbeae26943c91690e829
"Failed to download update": "Echec du téléchargement de la mise à jour", "Failed to download update": "Echec du téléchargement de la mise à jour",
"Delete Selected files?": "Supprimer les fichiers sélectionnés?", "Delete Selected files?": "Supprimer les fichiers sélectionnés?",
"Completely remove ": "Supprimer totalement ", "Completely remove ": "Supprimer totalement ",
"Are you sure you want to delete ": "Êtes-vous sûr de vouloir supprimer ", "Are you sure you want to delete ": "Êtes-vous sûr de vouloir supprimer ",
"Are you sure you wish to cancel?": "Souhaitez-vous vraiment annuler?", "Are you sure you wish to cancel?": "Souhaitez-vous vraiment annuler?",
<<<<<<< HEAD
"If this message appears repeatedly, please open an issue.": "Si ce message apparait en boucle veuillez ouvrir une issue."
=======
"If this message appears repeatedly, please open an issue.": "" "If this message appears repeatedly, please open an issue.": ""
>>>>>>> 3df676df0f432112aa14fbeae26943c91690e829
} }

View File

@@ -1053,9 +1053,9 @@ App::~App() {
NacpStruct nacp; NacpStruct nacp;
fs::FsNativeSd fs; fs::FsNativeSd fs;
if (R_SUCCEEDED(nro_get_nacp("/hbmenu.nro", nacp)) && std::strcmp(nacp.lang[0].name, "sphaira")) { if (R_SUCCEEDED(nro_get_nacp("/hbmenu.nro", nacp)) && std::strcmp(nacp.lang[0].name, "sphaira")) {
log_write("backing up hbmenu\n"); log_write("backing up hbmenu.nro\n");
if (R_FAILED(fs.copy_entire_file("/switch/hbmenu.nro", "/hbmenu.nro", true))) { if (R_FAILED(fs.copy_entire_file("/switch/hbmenu.nro", "/hbmenu.nro", true))) {
log_write("failed to copy sphaire.nro to hbmenu.nro\n"); log_write("failed to backup hbmenu.nro\n");
} }
} else { } else {
log_write("not backing up\n"); log_write("not backing up\n");

View File

@@ -317,7 +317,7 @@ void Menu::Sort() {
fs::FsPath star_path; fs::FsPath star_path;
for (auto& p : m_entries) { for (auto& p : m_entries) {
p.has_star = fs.FileExists(GenerateStarPath(p.path)); p.has_star = fs.FileExists(GenerateStarPath(p.path));
if (p.has_star) { if (p.has_star == true) {
log_write("found star: %s\n", p.path.s); log_write("found star: %s\n", p.path.s);
} else { } else {
log_write("no star: %s\n", p.path.s); log_write("no star: %s\n", p.path.s);