diff --git a/romfs/lang/de.json b/romfs/lang/de.json index dbee1c4..bf00989 100644 --- a/romfs/lang/de.json +++ b/romfs/lang/de.json @@ -9,10 +9,6 @@ "set": "Einstellungen", "exit": "Beenden" }, - "theme": { - "title": "Design anwenden", - "desc": "Themes werden aktiviert oder deaktiviert, wenn Tinwoo neu gestartet wird." - }, "hdd": { "title": "USB HDD", "notfound": "USB HDD ist nicht verfügbar." @@ -52,10 +48,8 @@ }, "url": { "hint": "Gib eine URL zu einer Datei ein", - "hint_theme": "Enter a valid address to download a theme", "invalid": "Die eingegebene URL ist ungültig", - "nolinks": "No XCI, XCZ, NSP, NSZ links found!\nDid you use the correct URL?", - "no_themes": "No themes found!\nDid you use the correct URL?", + "nolinks": "No XCI, XCZ, NSP, NSZ links Links gefunden!\nHaben Sie die richtige URL verwendet?", "source_string": " per URL", "listwait": "Das Auffüllen der Liste über eine URL kann einige Zeit dauern.\nDas Standardlimit der Liste ist absichtlich auf eingestellt ", "listwait2": " artikel.\nDrücken Sie OK, um die Liste zu laden." @@ -68,19 +62,14 @@ "sd": "Freier Speicherplatz auf der SD-Karte: ", "nand": "Freier Speicherplatz auf NAND: ", "index_error": "Keine Spiele gefunden!", - "theme_error": "No themes found!", "index_error_info": "Hast du die richtige URL eingegeben?", - "theme_error_info": "Did you enter the correct theme server source URL in the config page?", "top_info": "Wähle Dateien zur Installation vom Server aus und drücke dann \ue0b3 !", - "theme_top_info": "Select which theme you want to install, then press the \ue0ef button!", "top_info1": "Warte auf eine Verbindung... Die IP Adresse deiner Switch ist: ", "failed": "Ferninstallation fehlgeschlagen!", "transfer_interput": "Bei der Dateiübertragung ist ein Fehler aufgetreten.", "source_string": " über das Netzwerk", "buttons": "\ue0e3 Installation über das Internet \ue0e2 Hilfe \ue0e1 Abbrechen", - "buttons1": "\ue0e0 Datei auswählen \ue0e3 Alle auswählen \ue0ef Datei(en) installieren \ue0e1 Abbrechen", - "buttons2": "\ue0e0 Select File \ue0ef Install File \ue0e1 Cancel", - "please_wait": "Please wait - I'm trying to connect to the server!" + "buttons1": "\ue0e0 Datei auswählen \ue0e3 Alle auswählen \ue0ef Datei(en) installieren \ue0e1 Abbrechen" }, "sd": { "help": { @@ -184,19 +173,15 @@ "boost_mode": "Aktiviere \"Boost-Modus\" während der Installation", "ask_delete": "Frage ob installierte Titel gelöscht werden sollen", "auto_update": "Suche automatisch nach Updates für TinWoo", - "theme_option": "Design verwenden", "useSound": "Nutzen von Benachrichtungstönen während Installation", "fixticket": "Wandeln Sie temporäre Tickets in permanente Tickets um", "listoveride": "Deaktivieren Sie die URL-Listenwarnung und die Dateibeschränkung", "usehttpkeyboard": "Verwenden Sie die Tastatur während der Installation des HTTP-Servers", "sig_url": "Signatur Patches URL: ", "http_url": "Quell-URL des HTTP-Servers: ", - "theme_url": "Theme server source URL: ", "language": "Sprache: ", "check_update": "Suche nach Updates für TinWoo Installer", - "credits": "Danksagung", - "theme_menu": "Download themes", - "theme_fail": "Did you enter a correct theme URL?" + "credits": "Danksagung" }, "nca_warn": { "title": "Warnung!", @@ -237,5 +222,31 @@ "yes": "Ja", "no": "Nein", "cancel_desc": "Drücke \ue0e1 zum Abbrechen " + }, + "theme": { + "title": "Verwenden Sie ein Thema", + "desc": "Themes werden aktiviert oder deaktiviert, wenn Tinwoo neu gestartet wird.", + "hint_theme": "Geben Sie eine gültige Adresse ein, um ein Theme herunterzuladen", + "no_themes": "Keine Themen gefunden!\nHaben Sie die richtige URL verwendet?", + "theme_error": "Keine Themen gefunden!", + "theme_error_info": "Haben Sie auf der Konfigurationsseite die richtige Quell-URL des Theme-Servers eingegeben?", + "theme_top_info": "Wählen Sie das Theme aus, das Sie installieren möchten, und klicken Sie dann auf die Schaltfläche \ue0ef!", + "buttons2": "\ue0e0 Datei auswählen \ue0ef Datei installieren \ue0e1 Abbrechen", + "please_wait": "Bitte warten Sie, ich versuche, eine Verbindung zum Server herzustellen!", + "theme_option": "Verwenden Sie ein Thema", + "theme_url": "Quell-URL des Theme-Servers:", + "theme_menu": "Laden Sie Themen herunter", + "theme_fail": "Haben Sie eine korrekte Theme-URL eingegeben?", + "downloading": "Thema herunterladen: ", + "percent": " % vollständig", + "extracting": "Das Thema wird extrahiert, bitte warten!", + "complete": "Download abgeschlossen, Theme extrahieren, bitte warten!", + "failed": "Der Download ist fehlgeschlagen. Versuchen Sie es erneut?", + "extracted": "Theme extrahiert, starten Sie Tinwoo neu, um die Änderungen zu sehen", + "installed": "Theme installiert", + "restart": "Starten Sie Tinwoo neu, um die Änderungen zu sehen", + "retry": "Theme-Extraktion fehlgeschlagen, erneut versuchen?", + "wait": "Bitte warten!", + "trying": "Ich versuche gerade, ein Theme zu installieren" } } \ No newline at end of file diff --git a/romfs/lang/en.json b/romfs/lang/en.json index 6dea00a..0f4d60f 100644 --- a/romfs/lang/en.json +++ b/romfs/lang/en.json @@ -2,17 +2,13 @@ "main": { "menu": { "sd": "Install from SD card", - "net": "Install over LAN or internet", - "usb": "Install over USB", - "hdd": "Install over USB HDD", + "net": "Install via Network", + "usb": "Install via USB", + "hdd": "Install via USB HDD", "sig": "Manage signature patches", "set": "Settings", "exit": "Exit" }, - "theme": { - "title": "Use Theme", - "desc": "Themes will activate or deactivate when Tinwoo restarts." - }, "hdd": { "title": "USB HDD", "notfound": "USB HDD is not connected." @@ -24,7 +20,7 @@ "usb": { "warn": { "title": "Warning!", - "desc": "USB installations may not \"just werk\" on some devices and setups.\nIf you experience issues with USB installations, please don't pull your\nhair out! It's advised to use NS-USBloader for USB installations, or\nLAN/Internet installations instead for remote installation, especially\nwhen paired with an ethernet adapter!\n\nYou have been warned...", + "desc": "USB installations may not \"work\" on some devices and setups.\nIf you experience issues with USB installations, please don't pull your\nhair out! It's advised to use NS-USBloader for USB installations, or\nLAN/Internet installations instead for remote installation, especially\nwhen paired with an ethernet adapter!\n\nYou have been warned...", "opt1": "Don't tell me again" }, "error": { @@ -52,10 +48,8 @@ }, "url": { "hint": "Enter the Internet address of a file", - "hint_theme": "Enter a valid address to download a theme", "invalid": "The URL specified is invalid!", "nolinks": "No XCI, XCZ, NSP, NSZ links found!\nDid you use the correct URL?", - "no_themes": "No themes found!\nDid you use the correct URL?", "source_string": " from URL", "listwait": "Populating the list from a url can take some time.\nThe list default limit is purposely set to ", "listwait2": " items.\nPress OK to load the list." @@ -68,19 +62,14 @@ "sd": "Free space on sd card: ", "nand": "Free space on nand: ", "index_error": "No games found!", - "theme_error": "No themes found!", "index_error_info": "Did you enter the correct HTTP server source URL in the config page?", - "theme_error_info": "Did you enter the correct theme server source URL in the config page?", "top_info": "Select which files you want to install from the server, then press the \ue0ef button!", - "theme_top_info": "Select which theme you want to install, then press the \ue0ef button!", "top_info1": "Waiting for a connection... Your Switch's IP Address is: ", "failed": "Failed to perform remote install!", "transfer_interput": "An error occured during data transfer. Check your network connection.", "source_string": " over a network", - "buttons": "\ue0e3 Install Over Internet \ue0f0 Install From HTTP Directory \ue0e2 Help \ue0e1 Cancel", - "buttons1": "\ue0e0 Select File \ue0e3 Select All \ue0ef Install File(s) \ue0e1 Cancel", - "buttons2": "\ue0e0 Select File \ue0ef Install File \ue0e1 Cancel", - "please_wait": "Please wait - I'm trying to connect to the server!" + "buttons": "\ue0e3 Install via URL \ue0f0 Install via HTTP Server \ue0e2 Help \ue0e1 Cancel", + "buttons1": "\ue0e0 Select File \ue0e3 Select All \ue0ef Install File(s) \ue0e1 Cancel" }, "sd": { "help": { @@ -184,19 +173,15 @@ "boost_mode": "Enable \"boost mode\" during installations", "ask_delete": "Ask to delete original files after installation", "auto_update": "Check for updates to TinWoo Installer automatically", - "theme_option": "Use Theme", "useSound": "Use sound notifications during installs", "fixticket": "Convert temporary tickets to permanent", "listoveride": "Disable URL list warning and file limit", "usehttpkeyboard": "Use keyboard during http server installs", "sig_url": "Signature patches source URL: ", "http_url": "Network server source URL: ", - "theme_url": "Theme server source URL: ", "language": "Language: ", "check_update": "Check for updates to TinWoo Installer", - "credits": "Credits", - "theme_menu": "Download themes", - "theme_fail": "Did you enter a correct theme URL?" + "credits": "Credits" }, "nca_warn": { "title": "Warning!", @@ -237,5 +222,31 @@ "yes": "Yes", "no": "No", "cancel_desc": "Press B to cancel" + }, + "theme": { + "title": "Use Theme", + "desc": "Themes will activate or deactivate when Tinwoo restarts.", + "hint_theme": "Enter a valid address to download a theme", + "no_themes": "No themes found!\nDid you use the correct URL?", + "theme_error": "No themes found!", + "theme_error_info": "Did you enter the correct theme server source URL in the config page?", + "theme_top_info": "Select which theme you want to install, then press the \ue0ef button!", + "buttons2": "\ue0e0 Select File \ue0ef Install File \ue0e1 Cancel", + "please_wait": "Please wait, I'm trying to connect to the server!", + "theme_option": "Use Theme", + "theme_url": "Theme server source URL: ", + "theme_menu": "Download themes", + "theme_fail": "Did you enter a correct theme URL?", + "downloading": "Downloading theme: ", + "percent": " % complete", + "extracting": "Extracting theme, please wait!", + "complete": "Downloading complete, extracting theme, Please wait!", + "failed": "Downloading failed, try again?", + "extracted": "Theme Extracted, restart Tinwoo to see the changes", + "installed": "Theme installed", + "restart": "Restart Tinwoo to see the changes", + "retry": "Theme Extraction failed, try again?", + "wait": "Please Wait!", + "trying": "I'm currently tryng to install a theme" } } \ No newline at end of file diff --git a/romfs/lang/es.json b/romfs/lang/es.json index 567269d..946a969 100644 --- a/romfs/lang/es.json +++ b/romfs/lang/es.json @@ -9,10 +9,6 @@ "set": "Configuración", "exit": "Salir" }, - "theme": { - "title": "Usar tema", - "desc": "Los temas se activarán o desactivarán cuando Tinwoo se reinicie." - }, "hdd": { "title": "HDD USB", "notfound": "El disco duro USB no está conectado" @@ -52,10 +48,8 @@ }, "url": { "hint": "Ingrese el URL de un archivo", - "hint_theme": "Enter a valid address to download a theme", "invalid": "¡El URL especificado no es válido!", "nolinks": "No se eoncontraron archivos XCI, XCZ, NSP, NSZ!\n¿Utilizaste el URL correcto?", - "no_themes": "No themes found!\nDid you use the correct URL?", "source_string": "desde el URL", "listwait": "Generar el listado desde un URL puede tomar algún tiempo.\nSe ha configurado por defecto un límite de ", "listwait2": " elementos.\nPresione Press Aceptar para cargar la lista." @@ -68,19 +62,14 @@ "sd": "Espacio libre en la tarjeta SD: ", "nand": "Espacio libre en memoria (Emu)NAND: ", "index_error": "¡No se encontraron juegos!", - "theme_error": "No themes found!", "index_error_info": "¿Escribiste el URL correcto?", - "theme_error_info": "Did you enter the correct theme server source URL in the config page?", "top_info": "¡Selecciona qué archivos quieres instalar desde el servidor, luego presiona el botón \ue0ef!", "top_info1": "Esperando conexión... La dirección IP de su Switch es: ", - "theme_top_info": "Select which theme you want to install, then press the \ue0ef button!", "failed": "¡Error al realizar la instalación remota!", "transfer_interput": "Ocurrió un error durante la transferencia de datos. Verifica tu conexión de red.", "source_string": "a través de la red local", "buttons": "\ue0e3 Instalar a través de Internet \ue0f0 Instalar desde el directorio HTTP \ue0e2 Ayuda \ue0e1 Cancelar", - "buttons1": "\ue0e0 Seleccionar archivo \ue0e3 Seleccionar todo \ue0ef Instalar archivo(s) \ue0e1 Cancelar", - "buttons2": "\ue0e0 Select File \ue0ef Install File \ue0e1 Cancel", - "please_wait": "Please wait - I'm trying to connect to the server!" + "buttons1": "\ue0e0 Seleccionar archivo \ue0e3 Seleccionar todo \ue0ef Instalar archivo(s) \ue0e1 Cancelar" }, "sd": { "help": { @@ -135,7 +124,7 @@ "desc0": " ¡archivos instalados correctamente!", "desc1": "¡instalado!", "downloading": "Descargando", - "queue": "Files in queue: ", + "queue": "Archivos en cola: ", "at": "en" }, "nca_verify": { @@ -184,19 +173,15 @@ "boost_mode": "Habilitar \"modo empuje\" durante las instalaciones", "ask_delete": "Solicitar eliminar los archivos originales después de la instalación", "auto_update": "Busca actualizaciones para TinWoo Installer automáticamente", - "theme_option": "Usar tema", "useSound": "Usar notificaciones de sonido durante las instalaciones", "fixticket": "Convertir tiquetes temporales en permanentes", "listoveride": "Deshabilitar advertencia de limite de elementos en el listado de un URL", "usehttpkeyboard": "Utilizar teclado durante instalaciones vía servidor HTTP", "sig_url": "URL de origen para descargar SigPatches: ", "http_url": "URL para servidor origen HTTP: ", - "theme_url": "Theme server source URL: ", "language": "Idioma: ", "check_update": "Buscar actualizaciones de TinWoo Installer", - "credits": "Créditos", - "theme_menu": "Download themes", - "theme_fail": "Did you enter a correct theme URL?" + "credits": "Créditos" }, "nca_warn": { "title": "¡Advertencia!", @@ -237,5 +222,31 @@ "yes": "Si", "no": "No", "cancel_desc": "Presiona \ue0e1 para cancelar" + }, + "theme": { + "title": "Usar tema", + "desc": "Los temas se activarán o desactivarán cuando Tinwoo se reinicie.", + "hint_theme": "Ingrese una dirección válida para descargar un tema", + "no_themes": "¡No se encontraron temas!\n¿Usaste la URL correcta?", + "theme_error": "¡No se encontraron temas!", + "theme_error_info": "¿Ingresó la URL de origen del servidor de temas correcta en la página de configuración?", + "theme_top_info": "Seleccione el tema que desea instalar y luego presione el botón \ue0ef.", + "buttons2": "\ue0e0 Seleccionar archivo \ue0ef Instalar archivo \ue0e1 Cancelar", + "please_wait": "Espere, ¡estoy intentando conectarme al servidor!", + "theme_option": "Usar tema", + "theme_url": "URL de origen del servidor de temas:", + "theme_menu": "Descargar temas", + "theme_fail": "¿Ingresaste una URL de tema correcta?", + "downloading": "Descargando tema: ", + "percent": " % completo", + "extracting": "Extrayendo tema, ¡espere!", + "complete": "Descargando el tema completo, extrayendo, ¡espere!", + "failed": "Error al descargar, ¿intentar de nuevo?", + "extracted": "Tema extraído, reinicia Tinwoo para ver los cambios.", + "installed": "Tema instalado", + "restart": "Reinicie Tinwoo para ver los cambios.", + "retry": "Error al extraer el tema, ¿inténtalo de nuevo?", + "wait": "¡Espere por favor!", + "trying": "Actualmente estoy intentando instalar un tema." } } \ No newline at end of file diff --git a/romfs/lang/fr.json b/romfs/lang/fr.json index da6f208..b0d7134 100644 --- a/romfs/lang/fr.json +++ b/romfs/lang/fr.json @@ -9,10 +9,6 @@ "set": " Paramètres", "exit": " Quitter" }, - "theme": { - "title": "Utiliser le thème", - "desc": "Les thèmes s'activeront ou se désactiveront au redémarrage de Tinwoo." - }, "hdd": { "title": "USB HDD", "notfound": "USB HDD non connecté" @@ -52,10 +48,8 @@ }, "url": { "hint": "Entrez l'URL d'un fichier", - "hint_theme": "Enter a valid address to download a theme", "invalid": "L'URL spécifiée n'est pas valide !", "nolinks": "Aucun lien XCI, XCZ, NSP, NSZ trouvé !\nAvez-vous utilisé la bonne URL ?", - "no_themes": "No themes found!\nDid you use the correct URL?", "source_string": " à partir d'un URL", "listwait": "Remplir la liste à partir d'une URL peut prendre un certain temps.\nLa limite par défaut de la liste est volontairement définie sur ", "listwait2": " articles.\nAppuyez sur OK pour charger la liste." @@ -68,19 +62,14 @@ "sd": "Espace libre sur la carte SD: ", "nand": "Espace libre sur la NAND: ", "index_error": "Aucun jeu trouvé!", - "theme_error": "No themes found!", "index_error_info": "Avez vous tapez une url correcte?", - "theme_error_info": "Did you enter the correct theme server source URL in the config page?", "top_info": "Sélectionnez les fichiers que vous voulez installer à partir du serveur, puis appuyez sur le bouton Plus !", - "theme_top_info": "Select which theme you want to install, then press the \ue0ef button!", "top_info1": "En attente d'une connexion... L'adresse IP de votre switch est : ", "failed": "Echec de l'installation à distance !", "transfer_interput": "Une erreur s'est produite pendant le transfert des données. Vérifiez votre connexion réseau.", "source_string": " à partir d'un réeseau", "buttons": "\ue0e3 Installer via Internet \ue0e2 Aide \ue0e1 Annuler", - "buttons1": "\ue0e0 Sélectionnez un fichier \ue0e3 Tout sélectionner \ue0ef Installer un/des fichier(s) \ue0e1 Annuler", - "buttons2": "\ue0e0 Select File \ue0ef Install File \ue0e1 Cancel", - "please_wait": "Please wait - I'm trying to connect to the server!" + "buttons1": "\ue0e0 Sélectionnez un fichier \ue0e3 Tout sélectionner \ue0ef Installer un/des fichier(s) \ue0e1 Annuler" }, "sd": { "help": { @@ -184,19 +173,15 @@ "boost_mode": "Activer le \"boost mode\" pendant l'installation", "ask_delete": "Demande de suppression des fichiers originaux après l'installation", "auto_update": "Vérifier les mises à jour de l'installateur TinWoo automatiquement", - "theme_option": "Utiliser le thème", "useSound": "Utiliser les notifications sonores lors des installations", "fixticket": "Convertir des billets temporaires en billets permanents", "listoveride": "Désactiver l'avertissement de liste d'URL et la limite de fichiers", "usehttpkeyboard": "Utiliser le clavier lors des installations du serveur http", "sig_url": "Patchs de signatures URL: ", "http_url": "URL source du serveur HTTP: ", - "theme_url": "Theme server source URL: ", "language": "Langue: ", "check_update": "Vérifiez les mises à jour de l'installateur TinWoo", - "credits": "Crédits", - "theme_menu": "Download themes", - "theme_fail": "Did you enter a correct theme URL?" + "credits": "Crédits" }, "nca_warn": { "title": "Avertissement!", @@ -237,5 +222,31 @@ "yes": "Oui", "no": "Non", "cancel_desc": "Appuyez sur B pour annuler" + }, + "theme": { + "title": "Use Theme", + "desc": "Themes will activate or deactivate when Tinwoo restarts.", + "hint_theme": "Enter a valid address to download a theme", + "no_themes": "No themes found!\nDid you use the correct URL?", + "theme_error": "No themes found!", + "theme_error_info": "Did you enter the correct theme server source URL in the config page?", + "theme_top_info": "Select which theme you want to install, then press the \ue0ef button!", + "buttons2": "\ue0e0 Select File \ue0ef Install File \ue0e1 Cancel", + "please_wait": "Please wait, I'm trying to connect to the server!", + "theme_option": "Use Theme", + "theme_url": "Theme server source URL: ", + "theme_menu": "Download themes", + "theme_fail": "Did you enter a correct theme URL?", + "downloading": "Downloading theme: ", + "percent": " % complete", + "extracting": "Extracting theme, please wait!", + "complete": "Downloading complete, extracting theme, Please wait!", + "failed": "Downloading failed, try again?", + "extracted": "Theme Extracted, restart Tinwoo to see the changes", + "installed": "Theme installed", + "restart": "Restart Tinwoo to see the changes", + "retry": "Theme Extraction failed, try again?", + "wait": "Please Wait!", + "trying": "I'm currently tryng to install a theme" } } \ No newline at end of file diff --git a/romfs/lang/it.json b/romfs/lang/it.json index a29b444..c5af378 100644 --- a/romfs/lang/it.json +++ b/romfs/lang/it.json @@ -9,10 +9,6 @@ "set": "Impostazioni", "exit": "Esci" }, - "theme": { - "title": "Usa tema", - "desc": "I temi verranno attivati ​​o disattivati ​​al riavvio di Tinwoo." - }, "hdd": { "title": "USB HDD", "notfound": "L'HDD USB non è collegato." @@ -52,10 +48,8 @@ }, "url": { "hint": "Inserisci l'URL del file", - "hint_theme": "Enter a valid address to download a theme", "invalid": "L'URL specificato non è valido!", "nolinks": "Nessun collegamento XCI, XCZ, NSP, NSZ trovato!\nHai utilizzato l'URL corretto?", - "no_themes": "No themes found!\nDid you use the correct URL?", "source_string": " da URL", "listwait": "Compilare l'elenco da un URL può richiedere del tempo.\nIl limite predefinito dell'elenco è impostato di proposito su", "listwait2": " elementi.\nPremere OK per caricare l'elenco." @@ -68,19 +62,14 @@ "sd": "Spazio libero sulla scheda SD: ", "nand": "Spazio libero sulla NAND: ", "index_error": "Nessun gioco trovato!", - "theme_error": "No themes found!", "index_error_info": "Hai inserito l'URL di origine del server HTTP corretto nella pagina di configurazione?", - "theme_error_info": "Did you enter the correct theme server source URL in the config page?", "top_info": "Seleziona quali file vuoi installare dal server, poi premi il tasto Più!", - "theme_top_info": "Select which theme you want to install, then press the \ue0ef button!", "top_info1": "Aspettando una connnessione... L'indirizzo IP è: ", "failed": "Impossibile eseguire l'installazione remota!", "transfer_interput": "Si è verificato un errore durante il trasferimento dei dati. Controlla la tua connessione.", "source_string": " via rete", "buttons": "\ue0e3 Installa via internet \ue0e2 Aiuto \ue0e1 Annulla", - "buttons1": "\ue0e0 Seleziona File \ue0e3 Seleziona tutto \ue0ef Installa i File \ue0e1 Annulla", - "buttons2": "\ue0e0 Select File \ue0ef Install File \ue0e1 Cancel", - "please_wait": "Please wait - I'm trying to connect to the server!" + "buttons1": "\ue0e0 Seleziona File \ue0e3 Seleziona tutto \ue0ef Installa i File \ue0e1 Annulla" }, "sd": { "help": { @@ -184,19 +173,15 @@ "boost_mode": "Abilita la \"boost mode\" durante le installazioni", "ask_delete": "Chiedi di cancellare i file originale dopo l'installazione", "auto_update": "Controlla aggiornamenti di TinWoo Installer automaticamente", - "theme_option": "Usa tema", "useSound": "Utilizza notifiche sonore durante le installazioni", "fixticket": "Converti i biglietti temporanei in permanenti", "listoveride": "Disabilita l'avviso dell'elenco degli URL e il limite dei file", "usehttpkeyboard": "Utilizzare la tastiera durante le installazioni del server http", "sig_url": "Fonte URL SigPatches: ", "http_url": "URL di origine del server HTTP: ", - "theme_url": "Theme server source URL: ", "language": "Lingua: ", "check_update": "Controlla aggiornamenti di TinWoo Installer ora", - "credits": "Crediti", - "theme_menu": "Download themes", - "theme_fail": "Did you enter a correct theme URL?" + "credits": "Crediti" }, "nca_warn": { "title": "Attenzione!", @@ -237,5 +222,31 @@ "yes": "Sì", "no": "No", "cancel_desc": "Premi B per annullare" + }, + "theme": { + "title": "Use Theme", + "desc": "Themes will activate or deactivate when Tinwoo restarts.", + "hint_theme": "Enter a valid address to download a theme", + "no_themes": "No themes found!\nDid you use the correct URL?", + "theme_error": "No themes found!", + "theme_error_info": "Did you enter the correct theme server source URL in the config page?", + "theme_top_info": "Select which theme you want to install, then press the \ue0ef button!", + "buttons2": "\ue0e0 Select File \ue0ef Install File \ue0e1 Cancel", + "please_wait": "Please wait, I'm trying to connect to the server!", + "theme_option": "Use Theme", + "theme_url": "Theme server source URL: ", + "theme_menu": "Download themes", + "theme_fail": "Did you enter a correct theme URL?", + "downloading": "Downloading theme: ", + "percent": " % complete", + "extracting": "Extracting theme, please wait!", + "complete": "Downloading complete, extracting theme, Please wait!", + "failed": "Downloading failed, try again?", + "extracted": "Theme Extracted, restart Tinwoo to see the changes", + "installed": "Theme installed", + "restart": "Restart Tinwoo to see the changes", + "retry": "Theme Extraction failed, try again?", + "wait": "Please Wait!", + "trying": "I'm currently tryng to install a theme" } } \ No newline at end of file diff --git a/romfs/lang/jp.json b/romfs/lang/jp.json index 24edd50..c9c01dd 100644 --- a/romfs/lang/jp.json +++ b/romfs/lang/jp.json @@ -9,10 +9,6 @@ "set": "設定", "exit": "終了" }, - "theme": { - "title": "使用テーマ", - "desc": "Tinwoo が再起動すると、テーマがアクティブ化または非アクティブ化されます。" - }, "hdd": { "title": "USB HDD", "notfound": "USB HDDが接続されていません。" @@ -52,10 +48,8 @@ }, "url": { "hint": "ファイルのインターネットアドレスを入力してください", - "hint_theme": "Enter a valid address to download a theme", "invalid": "指定されたURLは無効です！", "nolinks": "XCI、XCZ、NSP、NSZ リンクが見つかりません。\n正しい URL を使用しましたか?", - "no_themes": "No themes found!\nDid you use the correct URL?", "source_string": " URLから", "listwait": "URL からリストにデータを入力するには時間がかかる場合があります.\nリストのデフォルト制限は意図的に次のように設定されています。 ", "listwait2": " アイテム.\nOKを押してリストをロードします." @@ -68,19 +62,14 @@ "sd": "SDカードの空き容量: ", "nand": "nandの空き容量: ", "index_error": "該当するゲームがありません!", - "theme_error": "No themes found!", "index_error_info": "正しいURLを入力しましたか?", - "theme_error_info": "Did you enter the correct theme server source URL in the config page?", "top_info": "サーバーからインストールするファイルを選択し、＋ボタンを押してください！", - "theme_top_info": "Select which theme you want to install, then press the \ue0ef button!", "top_info1": "接続を待機しています...スイッチのIPアドレスは次のとおりです。: ", "failed": "リモートインストールを実行できませんでした！", "transfer_interput": "データ転送中にエラーが発生しました。ネットワーク接続を確認してください。", "source_string": " ローカルネットワーク経由", "buttons": "\ue0e3 インターネット経由でインストールする \ue0e2 ヘルプ \ue0e1 キャンセル", - "buttons1": "\ue0e0 ファイルを選択 \ue0e3 すべて選択 \ue0ef ファイルをインストール \ue0e1 キャンセル", - "buttons2": "\ue0e0 Select File \ue0ef Install File \ue0e1 Cancel", - "please_wait": "Please wait - I'm trying to connect to the server!" + "buttons1": "\ue0e0 ファイルを選択 \ue0e3 すべて選択 \ue0ef ファイルをインストール \ue0e1 キャンセル" }, "sd": { "help": { @@ -184,19 +173,15 @@ "boost_mode": "インストール中に「ブーストモード」を有効にする", "ask_delete": "インストール後に元のファイルを削除する", "auto_update": "TinWooのアップデートを自動的に確認する", - "theme_option": "テーマを使用する", "useSound": "インストール時にサウンドで通知する", "fixticket": "一時的なチケットを永続的なチケットに変換する", "listoveride": "URL リストの警告とファイル制限を無効にする", "usehttpkeyboard": "httpサーバーのインストール中にキーボードを使用する", "sig_url": "署名パッチのソースURL: ", "http_url": "HTTPサーバーのソースURL: ", - "theme_url": "Theme server source URL: ", "language": "言語: ", "check_update": "TinWoo Installerのアップデートを確認", - "credits": "クレジット", - "theme_menu": "Download themes", - "theme_fail": "Did you enter a correct theme URL?" + "credits": "クレジット" }, "nca_warn": { "title": "警告!", @@ -237,5 +222,31 @@ "yes": "はい", "no": "いいえ", "cancel_desc": "Bを押してキャンセル" + }, + "theme": { + "title": "Use Theme", + "desc": "Themes will activate or deactivate when Tinwoo restarts.", + "hint_theme": "Enter a valid address to download a theme", + "no_themes": "No themes found!\nDid you use the correct URL?", + "theme_error": "No themes found!", + "theme_error_info": "Did you enter the correct theme server source URL in the config page?", + "theme_top_info": "Select which theme you want to install, then press the \ue0ef button!", + "buttons2": "\ue0e0 Select File \ue0ef Install File \ue0e1 Cancel", + "please_wait": "Please wait, I'm trying to connect to the server!", + "theme_option": "Use Theme", + "theme_url": "Theme server source URL: ", + "theme_menu": "Download themes", + "theme_fail": "Did you enter a correct theme URL?", + "downloading": "Downloading theme: ", + "percent": " % complete", + "extracting": "Extracting theme, please wait!", + "complete": "Downloading complete, extracting theme, Please wait!", + "failed": "Downloading failed, try again?", + "extracted": "Theme Extracted, restart Tinwoo to see the changes", + "installed": "Theme installed", + "restart": "Restart Tinwoo to see the changes", + "retry": "Theme Extraction failed, try again?", + "wait": "Please Wait!", + "trying": "I'm currently tryng to install a theme" } } \ No newline at end of file diff --git a/romfs/lang/ru.json b/romfs/lang/ru.json index 0657256..b088497 100644 --- a/romfs/lang/ru.json +++ b/romfs/lang/ru.json @@ -9,10 +9,6 @@ "set": "Настройки", "exit": "Выход" }, - "theme": { - "title": "Использовать тему", - "desc": "Темы активируются или деактивируются при перезапуске Tinwoo." - }, "hdd": { "title": "USB HDD", "notfound": "Жесткий диск USB не подключен." @@ -52,10 +48,8 @@ }, "url": { "hint": "Укажите ссылку на файл", - "hint_theme": "Enter a valid address to download a theme", "invalid": "Указан неверный URL!", "nolinks": "Ссылки XCI, XCZ, NSP, NSZ не найдены!\nВы использовали правильный URL?", - "no_themes": "No themes found!\nDid you use the correct URL?", "source_string": " из URL", "listwait": "Заполнение списка по URL-адресу может занять некоторое время.\nОграничение списка по умолчанию намеренно установлено на", "listwait2": " элементы.\nНажмите ОК, чтобы загрузить список." @@ -68,19 +62,14 @@ "sd": "Свободное место на SD-карте:", "nand": "Свободное место на NAND:", "index_error": "Игры не найдены!", - "theme_error": "No themes found!", "index_error_info": "Вы ввели правильный URL-адрес источника HTTP-сервера на странице конфигурации?", - "theme_error_info": "Did you enter the correct theme server source URL in the config page?", "top_info": "Выберите какие файлы вы хотите установить из сервера и нажмите \"+\"!", - "theme_top_info": "Select which theme you want to install, then press the \ue0ef button!", "top_info1": "Ожидание подключения... IP-адрес вашего Switch: ", "failed": "Не удалось выполнить установку из удалённого источника!", "transfer_interput": "Во время передачи возникла ошибка. Проверьте ваши настройки сети.", "source_string": " по локальной сети", "buttons": "\ue0e3 Установка через интернет \ue0e2 Помощь \ue0e1 Отмена", - "buttons1": "\ue0e0 Выбрать файл \ue0e3 Выбрать всё \ue0ef Установить файл(ы) \ue0e1 Отмена", - "buttons2": "\ue0e0 Select File \ue0ef Install File \ue0e1 Cancel", - "please_wait": "Please wait - I'm trying to connect to the server!" + "buttons1": "\ue0e0 Выбрать файл \ue0e3 Выбрать всё \ue0ef Установить файл(ы) \ue0e1 Отмена" }, "sd": { "help": { @@ -135,7 +124,7 @@ "desc0": " файлы успешно установлены!", "desc1": " установлен!", "downloading": "Загружаем ", - "queue": "Files in queue: ", + "queue": "Файлы в очереди: ", "at": " в " }, "nca_verify": { @@ -184,19 +173,15 @@ "boost_mode": "Включить \"boost-режим\" во время установки", "ask_delete": "Спрашивать разрешения удалить исходные файлы после установки", "auto_update": "Автоматически проверять наличие обновлений", - "theme_option": "Использовать тему", "useSound": "Используйте звуковые уведомления во время установки", "fixticket": "Превратить временные билеты в постоянные", "listoveride": "Отключить предупреждение списка URL-адресов и ограничение количества файлов", "usehttpkeyboard": "Используйте клавиатуру во время установки http-сервера", "sig_url": "URL для скачивания Signature patches: ", "http_url": "URL-адрес источника HTTP-сервера:", - "theme_url": "Theme server source URL: ", "language": "Язык: ", "check_update": "Проверить наличие обновлений TinWoo Installer", - "credits": "Благодарности", - "theme_menu": "Download themes", - "theme_fail": "Did you enter a correct theme URL?" + "credits": "Благодарности" }, "nca_warn": { "title": "Внимание!", @@ -237,5 +222,31 @@ "yes": "Да", "no": "Нет", "cancel_desc": "Нажмите B для отмены" + }, + "theme": { + "title": "Use Theme", + "desc": "Themes will activate or deactivate when Tinwoo restarts.", + "hint_theme": "Enter a valid address to download a theme", + "no_themes": "No themes found!\nDid you use the correct URL?", + "theme_error": "No themes found!", + "theme_error_info": "Did you enter the correct theme server source URL in the config page?", + "theme_top_info": "Select which theme you want to install, then press the \ue0ef button!", + "buttons2": "\ue0e0 Select File \ue0ef Install File \ue0e1 Cancel", + "please_wait": "Please wait, I'm trying to connect to the server!", + "theme_option": "Use Theme", + "theme_url": "Theme server source URL: ", + "theme_menu": "Download themes", + "theme_fail": "Did you enter a correct theme URL?", + "downloading": "Downloading theme: ", + "percent": " % complete", + "extracting": "Extracting theme, please wait!", + "complete": "Downloading complete, extracting theme, Please wait!", + "failed": "Downloading failed, try again?", + "extracted": "Theme Extracted, restart Tinwoo to see the changes", + "installed": "Theme installed", + "restart": "Restart Tinwoo to see the changes", + "retry": "Theme Extraction failed, try again?", + "wait": "Please Wait!", + "trying": "I'm currently tryng to install a theme" } } \ No newline at end of file diff --git a/romfs/lang/tw.json b/romfs/lang/tw.json index e2898ad..d8158f3 100644 --- a/romfs/lang/tw.json +++ b/romfs/lang/tw.json @@ -9,10 +9,6 @@ "set": "設定", "exit": "退出" }, - "theme": { - "title": "套用主題", - "desc": "當 Tinwoo 重新啟動時，主題將啟用或停用。" - }, "hdd": { "title": "USB HDD", "notfound": "沒有偵測到USB HDD隨身硬碟" @@ -53,9 +49,7 @@ "url": { "hint": "請輸入檔案的URL網路位址", "invalid": "URL網路位址無效！", - "hint_theme": "Enter a valid address to download a theme", "nolinks": "未找到 XCI、XCZ、NSP、NSZ 鏈接！\n您使用的 URL 是否正確？", - "no_themes": "No themes found!\nDid you use the correct URL?", "source_string": "來源為URL", "listwait": "從 url 填充列表可能需要一些時間。\n列表默認限制特意設置為", "listwait2": " 項目。\n按“確定”加載列表。" @@ -68,19 +62,14 @@ "sd": "SD 卡上的可用空間：", "nand": "nand 上的可用空間：", "index_error": "沒有找到遊戲！", - "theme_error": "No themes found!", "index_error_info": "您是否在配置頁面中輸入了正確的 HTTP 服務器源 URL？", - "theme_error_info": "Did you enter the correct theme server source URL in the config page?", "top_info": "選定要從伺服器安裝的檔案後，請按+鈕", - "theme_top_info": "Select which theme you want to install, then press the \ue0ef button!", "top_info1": "正在等待連線中... 你的Switch主機IP是: ", "failed": "遠端安裝失敗！", "transfer_interput": "檔案傳輸時發生錯誤，請檢查網路連線狀態是否正常", "source_string": " 透過區網進行安裝", "buttons": "\ue0e3 透過網路安裝 \ue0e2 說明 \ue0e1 取消", - "buttons1": "\ue0e0 選擇檔案 \ue0e3 全選 \ue0ef 安裝所選的檔案 \ue0e1 取消", - "buttons2": "\ue0e0 Select File \ue0ef Install File \ue0e1 Cancel", - "please_wait": "Please wait - I'm trying to connect to the server!" + "buttons1": "\ue0e0 選擇檔案 \ue0e3 全選 \ue0ef 安裝所選的檔案 \ue0e1 取消" }, "sd": { "help": { @@ -184,19 +173,15 @@ "boost_mode": "在進行安裝時啟用\"超頻\"模式", "ask_delete": "在安裝完成後，詢問是否刪除原始檔案", "auto_update": "自動檢查Tinwoo Installer的更新版本", - "theme_option": "套用主題", "useSound": "在安裝過程中使用音效提醒進度", "fixticket": "將臨時門票轉換為永久門票", "listoveride": "禁用 URL 列表警告和文件限制", "usehttpkeyboard": "在 http 服務器安裝期間使用鍵盤", "sig_url": "簽名修補程式來源URL: ", "http_url": "HTTP服務器源URL：", - "theme_url": "Theme server source URL: ", "language": "介面語系： ", "check_update": "檢查Tinwoo Installer的更新版本", - "credits": "感謝名單", - "theme_menu": "Download themes", - "theme_fail": "Did you enter a correct theme URL?" + "credits": "感謝名單" }, "nca_warn": { "title": "注意！", @@ -237,5 +222,31 @@ "yes": "是", "no": "否", "cancel_desc": "按B鈕取消" + }, + "theme": { + "title": "Use Theme", + "desc": "Themes will activate or deactivate when Tinwoo restarts.", + "hint_theme": "Enter a valid address to download a theme", + "no_themes": "No themes found!\nDid you use the correct URL?", + "theme_error": "No themes found!", + "theme_error_info": "Did you enter the correct theme server source URL in the config page?", + "theme_top_info": "Select which theme you want to install, then press the \ue0ef button!", + "buttons2": "\ue0e0 Select File \ue0ef Install File \ue0e1 Cancel", + "please_wait": "Please wait, I'm trying to connect to the server!", + "theme_option": "Use Theme", + "theme_url": "Theme server source URL: ", + "theme_menu": "Download themes", + "theme_fail": "Did you enter a correct theme URL?", + "downloading": "Downloading theme: ", + "percent": " % complete", + "extracting": "Extracting theme, please wait!", + "complete": "Downloading complete, extracting theme, Please wait!", + "failed": "Downloading failed, try again?", + "extracted": "Theme Extracted, restart Tinwoo to see the changes", + "installed": "Theme installed", + "restart": "Restart Tinwoo to see the changes", + "retry": "Theme Extraction failed, try again?", + "wait": "Please Wait!", + "trying": "I'm currently tryng to install a theme" } } \ No newline at end of file diff --git a/source/ThemeInstall.cpp b/source/ThemeInstall.cpp index 93d6d74..371b34f 100644 --- a/source/ThemeInstall.cpp +++ b/source/ThemeInstall.cpp @@ -161,7 +161,7 @@ namespace ThemeInstStuff { unsigned short nowlist = 0; if (inst::config::httpkeyboard) { - url = inst::util::softwareKeyboard("inst.net.url.hint_theme"_lang, inst::config::httplastUrl2, 500); + url = inst::util::softwareKeyboard("theme.hint_theme"_lang, inst::config::httplastUrl2, 500); inst::config::httplastUrl2 = url; inst::config::setConfig(); //refresh options page @@ -173,7 +173,7 @@ namespace ThemeInstStuff { if (url == "") { url = ("http://127.0.0.1"); - inst::ui::mainApp->CreateShowDialog("options.menu_items.theme_fail"_lang, "inst.net.help.blank"_lang, { "common.ok"_lang }, true, "romfs:/images/icons/information.png"); + inst::ui::mainApp->CreateShowDialog("theme.theme_fail"_lang, "inst.net.help.blank"_lang, { "common.ok"_lang }, true, "romfs:/images/icons/information.png"); inst::config::httplastUrl2 = url; inst::config::setConfig(); //refresh options page @@ -197,7 +197,7 @@ namespace ThemeInstStuff { if (response.empty()) { response = inst::curl::html_to_buffer(url); if (response.empty()) { - inst::ui::mainApp->CreateShowDialog("inst.net.theme_error"_lang, "inst.net.theme_error_info"_lang, { "common.ok"_lang }, true, "romfs:/images/icons/fail.png"); + inst::ui::mainApp->CreateShowDialog("theme.theme_error"_lang, "theme.theme_error_info"_lang, { "common.ok"_lang }, true, "romfs:/images/icons/fail.png"); break; } } @@ -282,7 +282,7 @@ namespace ThemeInstStuff { } else { - inst::ui::mainApp->CreateShowDialog("inst.net.url.no_themes"_lang, "", { "common.ok"_lang }, false, "romfs:/images/icons/fail.png"); + inst::ui::mainApp->CreateShowDialog("theme.no_themes"_lang, "", { "common.ok"_lang }, false, "romfs:/images/icons/fail.png"); LOG_DEBUG("Failed to parse themes from HTML\n"); break; } @@ -290,14 +290,14 @@ namespace ThemeInstStuff { } else { - inst::ui::mainApp->CreateShowDialog("inst.net.theme_error"_lang, "inst.net.theme_error_info"_lang, { "common.ok"_lang }, true, "romfs:/images/icons/fail.png"); + inst::ui::mainApp->CreateShowDialog("theme.theme_error"_lang, "theme.theme_error_info"_lang, { "common.ok"_lang }, true, "romfs:/images/icons/fail.png"); break; } } else { LOG_DEBUG("Failed to fetch theme list\n"); - inst::ui::mainApp->CreateShowDialog("inst.net.theme_error"_lang, "inst.net.theme_error_info"_lang, { "common.ok"_lang }, true, "romfs:/images/icons/fail.png"); + inst::ui::mainApp->CreateShowDialog("theme.theme_error"_lang, "theme.theme_error_info"_lang, { "common.ok"_lang }, true, "romfs:/images/icons/fail.png"); break; } } diff --git a/source/ui/ThemeInstPage.cpp b/source/ui/ThemeInstPage.cpp index bd0f82b..dcd8355 100644 --- a/source/ui/ThemeInstPage.cpp +++ b/source/ui/ThemeInstPage.cpp @@ -71,9 +71,11 @@ namespace inst::ui { } void ThemeInstPage::drawMenuItems_withext(bool clearItems) { - int myindex = this->menu->GetSelectedIndex(); //store index so when page redraws we can get the last item we checked. + myindex = this->menu->GetSelectedIndex(); //store index so when page redraws we can get the last item we checked. if (clearItems) this->selectedUrls = {}; if (clearItems) this->alternativeNames = {}; + mainApp->ThemeinstPage->installBar->SetProgress(0); + mainApp->ThemeinstPage->installBar->SetVisible(false); std::string itm; this->menu->ClearItems(); @@ -90,16 +92,16 @@ namespace inst::ui { } this->menu->AddItem(ourEntry); this->menu->SetSelectedIndex(myindex); //jump to the index we saved from above - mainApp->ThemeinstPage->installBar->SetProgress(0); - mainApp->ThemeinstPage->installBar->SetVisible(false); } } void ThemeInstPage::drawMenuItems(bool clearItems) { - int myindex = this->menu->GetSelectedIndex(); //store index so when page redraws we can get the last item we checked. + myindex = this->menu->GetSelectedIndex(); //store index so when page redraws we can get the last item we checked. if (clearItems) this->selectedUrls = {}; if (clearItems) this->alternativeNames = {}; std::string itm; + mainApp->ThemeinstPage->installBar->SetProgress(0); + mainApp->ThemeinstPage->installBar->SetVisible(false); this->menu->ClearItems(); for (auto& urls : this->ourUrls) { @@ -124,26 +126,31 @@ namespace inst::ui { } void ThemeInstPage::setInstBarPerc(double ourPercent) { - mainApp->ThemeinstPage->installBar->SetVisible(true); mainApp->ThemeinstPage->installBar->SetProgress(ourPercent); + if (ourPercent >= 1 && ourPercent != 100) { + mainApp->ThemeinstPage->installBar->SetVisible(true); + } + else { + mainApp->ThemeinstPage->installBar->SetVisible(false); + } // if (installing == 1){ std::stringstream x; x << ourPercent; - inst::ui::mainApp->ThemeinstPage->pageInfoText->SetText("Downloading theme: " + x.str() + " % complete"); + inst::ui::mainApp->ThemeinstPage->pageInfoText->SetText("theme.downloading"_lang + x.str() + "theme.percent"_lang); if (x.str() == "100"){ - inst::ui::mainApp->ThemeinstPage->pageInfoText->SetText("Extracting theme - please wait!"); + inst::ui::mainApp->ThemeinstPage->pageInfoText->SetText("theme.extracting"_lang); } } else{ - inst::ui::mainApp->ThemeinstPage->pageInfoText->SetText("inst.net.theme_top_info"_lang); + inst::ui::mainApp->ThemeinstPage->pageInfoText->SetText("theme.theme_top_info"_lang); } // mainApp->CallForRender(); } void ThemeInstPage::startNetwork() { - this->butText->SetText("inst.net.please_wait"_lang); + this->butText->SetText("theme.please_wait"_lang); this->menu->SetVisible(false); this->menu->ClearItems(); this->infoImage->SetVisible(true); @@ -160,8 +167,8 @@ namespace inst::ui { mainApp->CallForRender(); // If we re-render a few times during this process the main screen won't flicker sourceString2 = "inst.net.source_string"_lang; netConnected2 = true; - this->pageInfoText->SetText("inst.net.theme_top_info"_lang); - this->butText->SetText("inst.net.buttons2"_lang); + this->pageInfoText->SetText("theme.theme_top_info"_lang); + this->butText->SetText("theme.buttons2"_lang); this->drawMenuItems(true); mainApp->CallForRender(); this->infoImage->SetVisible(false); // @@ -180,7 +187,7 @@ namespace inst::ui { bool didDownload = inst::curl::downloadFile(selectedUrls[0], ourPath.c_str(), 0, true); bool didExtract = false; if (didDownload) { - inst::ui::mainApp->ThemeinstPage->pageInfoText->SetText("Downloading complete - extracting theme, Please wait!"); + inst::ui::mainApp->ThemeinstPage->pageInfoText->SetText("theme.complete"_lang); try { didExtract = inst::zip::extractFile(ourPath, "sdmc:/"); } @@ -189,17 +196,17 @@ namespace inst::ui { } } else { - inst::ui::mainApp->ThemeinstPage->pageInfoText->SetText("Downloading failed - try again?"); + inst::ui::mainApp->ThemeinstPage->pageInfoText->SetText("theme.failed"_lang); installing = 0; inst::ui::mainApp->ThemeinstPage->setInstBarPerc(0); mainApp->ThemeinstPage->installBar->SetVisible(false); - inst::ui::mainApp->CreateShowDialog("inst.net.theme_error"_lang, "inst.net.theme_error_info"_lang, { "common.ok"_lang }, true, "romfs:/images/icons/fail.png"); + inst::ui::mainApp->CreateShowDialog("theme.theme_error"_lang, "theme.theme_error_info"_lang, { "common.ok"_lang }, true, "romfs:/images/icons/fail.png"); return; } std::filesystem::remove(ourPath); if (didExtract) { - inst::ui::mainApp->ThemeinstPage->pageInfoText->SetText("Theme Extracted, restart Tinwoo to see the changes"); - int close = inst::ui::mainApp->CreateShowDialog("Theme installed", "Restart Tinwoo to see the changes", { "sig.later"_lang, "sig.restart"_lang }, false, "romfs:/images/icons/good.png"); + inst::ui::mainApp->ThemeinstPage->pageInfoText->SetText("theme.extracted"_lang); + int close = inst::ui::mainApp->CreateShowDialog("theme.installed"_lang, "theme.restart"_lang, { "sig.later"_lang, "sig.restart"_lang }, false, "romfs:/images/icons/good.png"); inst::ui::mainApp->ThemeinstPage->setInstBarPerc(0); mainApp->ThemeinstPage->installBar->SetVisible(false); if (close != 0) { @@ -208,11 +215,10 @@ namespace inst::ui { } } else { - inst::ui::mainApp->ThemeinstPage->pageInfoText->SetText("Theme Extracted failed, try again?"); + inst::ui::mainApp->ThemeinstPage->pageInfoText->SetText("theme.retry"_lang); installing = 0; inst::ui::mainApp->ThemeinstPage->setInstBarPerc(0); mainApp->ThemeinstPage->installBar->SetVisible(false); - inst::ui::mainApp->CreateShowDialog("Extraction failed", "Ooops", { "common.ok"_lang }, true, "romfs:/images/icons/fail.png"); return; } @@ -223,7 +229,7 @@ namespace inst::ui { } } else { - inst::ui::mainApp->CreateShowDialog("Please Wait!", "I'm currently tryng to install a theme", { "common.ok"_lang }, true, "romfs:/images/icons/information.png"); + inst::ui::mainApp->CreateShowDialog("theme.wait"_lang, "theme.trying"_lang, { "common.ok"_lang }, true, "romfs:/images/icons/information.png"); } installing = 0; } @@ -235,7 +241,7 @@ namespace inst::ui { mainApp->LoadLayout(mainApp->optionspage); } else { - inst::ui::mainApp->CreateShowDialog("Please Wait!", "I'm currently tryng to install a theme", { "common.ok"_lang }, true, "romfs:/images/icons/information.png"); + inst::ui::mainApp->CreateShowDialog("theme.wait"_lang, "theme.trying"_lang, { "common.ok"_lang }, true, "romfs:/images/icons/information.png"); } } @@ -290,12 +296,16 @@ namespace inst::ui { //don't show file extensions if (Down & HidNpadButton_Left) { - this->drawMenuItems(true); + if (installing != 1) { + this->drawMenuItems(true); + } } //show file extensions if (Down & HidNpadButton_Right) { - this->drawMenuItems_withext(true); + if (installing != 1) { + this->drawMenuItems_withext(true); + } } } } \ No newline at end of file diff --git a/source/ui/optionsPage.cpp b/source/ui/optionsPage.cpp index 0dbf957..f41ac2e 100644 --- a/source/ui/optionsPage.cpp +++ b/source/ui/optionsPage.cpp @@ -14,7 +14,6 @@ #define COLOR(hex) pu::ui::Color::FromHex(hex) - namespace inst::ui { extern MainApplication* mainApp; s32 prev_touchcount = 0; @@ -114,7 +113,7 @@ namespace inst::ui { } void thememessage() { - int ourResult = inst::ui::mainApp->CreateShowDialog("main.theme.title"_lang, "main.theme.desc"_lang, { "common.no"_lang, "common.yes"_lang }, true, "romfs:/images/icons/theme.png"); + int ourResult = inst::ui::mainApp->CreateShowDialog("theme.title"_lang, "theme.desc"_lang, { "common.no"_lang, "common.yes"_lang }, true, "romfs:/images/icons/theme.png"); if (ourResult != 0) { if (!inst::config::useTheme) { inst::config::useTheme = true; @@ -179,18 +178,18 @@ namespace inst::ui { httpkeyboard->SetIcon(this->getMenuOptionIcon(inst::config::httpkeyboard)); this->menu->AddItem(httpkeyboard); - auto useThemeOption = pu::ui::elm::MenuItem::New("options.menu_items.theme_option"_lang); + auto useThemeOption = pu::ui::elm::MenuItem::New("theme.theme_option"_lang); useThemeOption->SetColor(COLOR("#FFFFFFFF")); useThemeOption->SetIcon(this->getMenuOptionIcon(inst::config::useTheme)); this->menu->AddItem(useThemeOption); - auto ThemeMenuOption = pu::ui::elm::MenuItem::New("options.menu_items.theme_menu"_lang); + auto ThemeMenuOption = pu::ui::elm::MenuItem::New("theme.theme_menu"_lang); ThemeMenuOption->SetColor(COLOR("#FFFFFFFF")); ThemeMenuOption->SetIcon("romfs:/images/icons/thememenu.png"); this->menu->AddItem(ThemeMenuOption); // - auto ThemeUrlOption = pu::ui::elm::MenuItem::New("options.menu_items.theme_url"_lang + inst::util::shortenString(inst::config::httplastUrl2, 42, false)); + auto ThemeUrlOption = pu::ui::elm::MenuItem::New("theme.theme_url"_lang + inst::util::shortenString(inst::config::httplastUrl2, 42, false)); ThemeUrlOption->SetColor(COLOR("#FFFFFFFF")); ThemeUrlOption->SetIcon("romfs:/images/icons/themeurl.png"); this->menu->AddItem(ThemeUrlOption);