diff --git a/romfs/lang/de.json b/romfs/lang/de.json index bf00989..7d30890 100644 --- a/romfs/lang/de.json +++ b/romfs/lang/de.json @@ -230,7 +230,7 @@ "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!", + "theme_top_info": "Wählen Sie eine zum Installieren aus und drücken Sie dann die \ue0ef Taste!", "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", diff --git a/romfs/lang/fr.json b/romfs/lang/fr.json index b0d7134..f4f452c 100644 --- a/romfs/lang/fr.json +++ b/romfs/lang/fr.json @@ -224,29 +224,29 @@ "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" + "title": "Utiliser le thème", + "desc": "Les thèmes s'activeront ou se désactiveront au redémarrage de Tinwoo.", + "hint_theme": "Entrez une adresse valide pour télécharger un thème", + "no_themes": "Aucun thème trouvé !\nAvez-vous utilisé la bonne URL ?", + "theme_error": "Aucun thème trouvé !", + "theme_error_info": "Avez-vous entré l'URL source correcte du serveur de thème dans la page de configuration ?", + "theme_top_info": "Sélectionnez le thème que vous souhaitez installer, puis appuyez sur le bouton \ue0ef !", + "buttons2": "\ue0e0 Sélectionnez Fichier \ue0ef Installer le fichier \ue0e1 Annuler", + "please_wait": "Veuillez patienter, j'essaie de me connecter au serveur !", + "theme_option": "Utiliser le thème", + "theme_url": "URL source du serveur de thème : ", + "theme_menu": "Télécharger des thèmes", + "theme_fail": "Avez-vous saisi une URL de thème correcte ?", + "downloading": "Thème de téléchargement : ", + "percent": " % achevé", + "extracting": "Extraction du thème, veuillez patienter !", + "complete": "Téléchargement terminé, extraction du thème, veuillez patienter !", + "failed": "Le téléchargement a échoué, réessayez ?", + "extracted": "Thème extrait, redémarrez Tinwoo pour voir les changements", + "installed": "Thème installé", + "restart": "Redémarrez Tinwoo pour voir les changements", + "retry": "L'extraction du thème a échoué. Réessayez ?", + "wait": "S'il vous plaît, attendez!", + "trying": "J'essaie actuellement d'installer un thème" } } \ No newline at end of file diff --git a/romfs/lang/it.json b/romfs/lang/it.json index c5af378..4cdd7df 100644 --- a/romfs/lang/it.json +++ b/romfs/lang/it.json @@ -32,7 +32,7 @@ "title": "Applet Mode non è supportata", "desc": "Puoi incontrare problemi utilizzando TinWoo Installer in Applet Mode. Se\nriscontri problemi, ti prego di utilizzare TinWoo Installer avviandolo attraverso un gioco\ngià installato (tieni premuto R mentre avvii un gioco)!" }, - "buttons": "\ue0e0 Seleziona \ue0e3 Spazio libero \ue0e4+\ue0e5 o \ue0ef o \ue0f0 Esci" + "buttons": "\ue0e0 Seleziona \ue0e3 Spazio libero \ue0e4+\ue0e5 o \ue0ef o \ue0f0 Esci" }, "inst": { "net": { @@ -224,29 +224,29 @@ "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" + "title": "Usa tema", + "desc": "I temi verranno attivati ​​o disattivati ​​al riavvio di Tinwoo.", + "hint_theme": "Inserisci un indirizzo valido per scaricare un tema", + "no_themes": "Nessun tema trovato!\nHai utilizzato l'URL corretto?", + "theme_error": "Nessun tema trovato!", + "theme_error_info": "Hai inserito l'URL di origine del server dei temi corretto nella pagina di configurazione?", + "theme_top_info": "Seleziona il tema che desideri installare, quindi premi il pulsante \ue0ef!", + "buttons2": "\ue0e0 Seleziona file \ue0ef Installa file \ue0e1 Annulla", + "please_wait": "Per favore aspetta, sto cercando di connettermi al server!", + "theme_option": "Usa tema", + "theme_url": "URL di origine del server dei temi: ", + "theme_menu": "Scarica temi", + "theme_fail": "Hai inserito l'URL del tema corretto?", + "downloading": "Download del tema: ", + "percent": " % di completamento", + "extracting": "Estrazione del tema, attendere per favore!", + "complete": "Download completo, estrazione del tema, attendere per favore!", + "failed": "Download non riuscito, riprovare?", + "extracted": "Tema estratto, riavvia Tinwoo per vedere le modifiche", + "installed": "Tema installato", + "restart": "Riavvia Tinwoo per vedere le modifiche", + "retry": "Estrazione del tema non riuscita, riprovare?", + "wait": "Attendere prego!", + "trying": "Attualmente sto provando a installare un tema" } } \ No newline at end of file diff --git a/romfs/lang/jp.json b/romfs/lang/jp.json index c9c01dd..9748595 100644 --- a/romfs/lang/jp.json +++ b/romfs/lang/jp.json @@ -224,29 +224,29 @@ "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" + "title": "テーマを使用", + "desc": "Tinwoo の再起動時にテーマがアクティブ化または非アクティブ化されます。", + "hint_theme": "テーマをダウンロードするには有効なアドレスを入力してください", + "no_themes": "テーマが見つかりません!\n正しい URL を使用しましたか?", + "theme_error": "テーマが見つかりません!", + "theme_error_info": "設定ページに正しいテーマ サーバーのソース URL を入力しましたか?", + "theme_top_info": "インストールするテーマを選択して、\ue0ef ボタンを押してください!", + "buttons2": "\ue0e0 ファイルを選択 \ue0ef ファイルをインストール \ue0e1 キャンセル", + "please_wait": "サーバーに接続しようとしているのでお待ちください!", + "theme_option": "テーマを使用", + "theme_url": "テーマサーバーのソース URL: ", + "theme_menu": "テーマをダウンロード", + "theme_fail": "正しいテーマ URL を入力しましたか?", + "downloading": "テーマをダウンロード中: ", + "percent": " % 完了", + "extracting": "テーマを抽出中です。お待​​ちください!", + "complete": "ダウンロードが完了しました。テーマを抽出しています。お待ちください。", + "failed": "ダウンロードに失敗しました。もう一度試してください?", + "extracted": "テーマが抽出されました。Tinwoo を再起動して変更を確認します", + "installed": "テーマがインストールされています", + "restart": "Tinwoo を再起動して変更を確認します", + "retry": "テーマの抽出に失敗しました。もう一度お試しください?", + "wait": "お待ちください!", + "trying": "現在テーマをインストールしようとしています" } } \ No newline at end of file diff --git a/romfs/lang/ru.json b/romfs/lang/ru.json index b088497..4706cb3 100644 --- a/romfs/lang/ru.json +++ b/romfs/lang/ru.json @@ -224,29 +224,29 @@ "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" + "title": "Использовать тему", + "desc": "Темы будут активироваться или деактивироваться при перезапуске Tinwoo.", + "hint_theme": "Введите действительный адрес, чтобы загрузить тему", + "no_themes": "Темы не найдены!\nВы использовали правильный URL?", + "theme_error": "Темы не найдены!", + "theme_error_info": "Вы ввели правильный URL-адрес источника сервера тем на странице конфигурации?", + "theme_top_info": "Выберите тему, которую вы хотите установить, затем нажмите кнопку \ue0ef!", + "buttons2": "\ue0e0 Выбрать файл \ue0ef Установить файл \ue0e1 Отменить", + "please_wait": "Пожалуйста, подождите, я пытаюсь подключиться к серверу!", + "theme_option": "Использовать тему", + "theme_url": "URL исходного сервера темы: ", + "theme_menu": "Загрузить темы", + "theme_fail": "Вы ввели правильный URL-адрес темы?", + "downloading": "Скачивание темы: ", + "percent": "% завершено", + "extracting": "Извлечение темы, пожалуйста, подождите!", + "complete": "Загрузка завершена, тема извлечена. Подождите!", + "failed": "Загрузка не удалась, попробуйте еще раз?", + "extracted": "Тема извлечена, перезапустите Tinwoo, чтобы увидеть изменения", + "installed": "Тема установлена", + "restart": "Перезапустите Tinwoo, чтобы увидеть изменения", + "retry": "Не удалось извлечь тему, попробуйте еще раз?", + "wait": "Пожалуйста, подождите!", + "trying": "Сейчас я пытаюсь установить тему" } } \ No newline at end of file diff --git a/romfs/lang/tw.json b/romfs/lang/tw.json index d8158f3..b60ad81 100644 --- a/romfs/lang/tw.json +++ b/romfs/lang/tw.json @@ -224,29 +224,29 @@ "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" + "title": "使用主題", + "desc": "Tinwoo 重新啟動時主題將啟動或停用。", + "hint_theme": "輸入有效的地址下載主題", + "no_themes": "未找到主題!\n您使用的 URL 是否正確?", + "theme_error": "未找到主題!", + "theme_error_info": "您在設定頁面中輸入了正確的主題伺服器來源 URL 嗎?", + "theme_top_info": "選擇您要安裝的主題,然後按 \ue0ef 按鈕!", + "buttons2": "\ue0e0 選擇檔案 \ue0ef 安裝檔案 \ue0e1 取消", + "please_wait": "請稍候,我正在嘗試連接伺服器!", + "theme_option": "使用主題", + "theme_url": "主題伺服器來源網址:", + "theme_menu": "下載主題", + "theme_fail": "您輸入的主題 URL 是否正確?", + "downloading": "正在下載主題:", + "percent": "完成%", + "extracting": "正在提取主題,請稍候!", + "complete": "下載完成,正在提取主題,請稍候!", + "failed": "下載失敗,請重試?", + "extracted": "主題已提取,重啟Tinwoo即可看到變化", + "installed": "主題已安裝", + "restart": "重新啟動 Tinwoo 以查看變更", + "retry": "主題擷取失敗,請重試?", + "wait": "請稍候!", + "trying": "我目前正在嘗試安裝主題" } } \ No newline at end of file diff --git a/source/install/nsp.cpp b/source/install/nsp.cpp index ae9e394..7d72fef 100644 --- a/source/install/nsp.cpp +++ b/source/install/nsp.cpp @@ -30,6 +30,14 @@ SOFTWARE. #include "util/error.hpp" #include "util/debug.h" +// +#include "util/lang.hpp" +#include "ui/MainApplication.hpp" +namespace inst::ui { + extern MainApplication* mainApp; +} +// + namespace tin::install::nsp { NSP::NSP() {} @@ -84,7 +92,7 @@ namespace tin::install::nsp const PFS0FileEntry* fileEntry = this->GetFileEntry(i); std::string name(this->GetFileEntryName(fileEntry)); auto foundExtension = name.substr(name.find(".") + 1); - + // fix cert filename extension becoming corrupted when xcz/nsz is installing certs. std::string cert ("cert"); std::size_t found = name.find(cert); @@ -165,6 +173,8 @@ namespace tin::install::nsp fprintf(fp, "%s\n", info); fclose(fp); */ + + //inst::ui::mainApp->CreateShowDialog("No cert found", "yikes", { "common.ok"_lang }, true, "romfs:/images/icons/information.png"); return reinterpret_cast(m_headerBytes.data() + stringTableStart + fileEntry->stringTableOffset); }