diff --git a/Languages/czech.lang b/Languages/czech.lang index 656f75a8..42f5ad12 100644 --- a/Languages/czech.lang +++ b/Languages/czech.lang @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-29 12:52-0400\n" +"POT-Creation-Date: 2009-07-29 22:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n" "Last-Translator: David Jelinek (djelinek@hotmail.com) \n" "Language-Team: r662 - last version on http://startgolf.tym.cz/czech.lang \n" @@ -379,6 +379,9 @@ msgstr "Chcete to zkusit znovu za 30 sekund?" msgid "Do you want to use the alt dol that is known to be correct?" msgstr "Přejete si použít jiný DOL, který je správný?" +msgid "Do you wish to update/download all language files?" +msgstr "" + msgid "Dol Path" msgstr "Cesta k DOL" @@ -991,6 +994,12 @@ msgstr "Plná aktualizace" msgid "Update DOL" msgstr "Aktualizace DOL" +msgid "Update Files" +msgstr "" + +msgid "Update all Languagefiles" +msgstr "" + msgid "Update failed" msgstr "Aktualizace selhala" @@ -1006,13 +1015,7 @@ msgstr "Cesta pro aktualizaci zmenena" msgid "Updating" msgstr "Aktualizuji" -msgid "Updating Language Files" -msgstr "" - -msgid "Updating Language files" -msgstr "" - -msgid "Updating WiiTDB.zip" +msgid "Updating Languagefiles:" msgstr "" msgid "VIDTV Patch" diff --git a/Languages/danish.lang b/Languages/danish.lang index 09407628..a95565d7 100644 --- a/Languages/danish.lang +++ b/Languages/danish.lang @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-29 12:52-0400\n" +"POT-Creation-Date: 2009-07-29 22:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -379,6 +379,9 @@ msgstr "Vil du prøve igen?" msgid "Do you want to use the alt dol that is known to be correct?" msgstr "Vil du bruge den alternative dol der med sikkerhed er korrekt?" +msgid "Do you wish to update/download all language files?" +msgstr "" + msgid "Dol Path" msgstr "Stil til DOL" @@ -991,6 +994,12 @@ msgstr "Opdatér alt" msgid "Update DOL" msgstr "Opdatér DOL" +msgid "Update Files" +msgstr "" + +msgid "Update all Languagefiles" +msgstr "" + msgid "Update failed" msgstr "Opdateringen mislykkedes" @@ -1006,13 +1015,7 @@ msgstr "Sti til opdateringer ændret." msgid "Updating" msgstr "Opdaterer..." -msgid "Updating Language Files" -msgstr "" - -msgid "Updating Language files" -msgstr "" - -msgid "Updating WiiTDB.zip" +msgid "Updating Languagefiles:" msgstr "" msgid "VIDTV Patch" diff --git a/Languages/dutch.lang b/Languages/dutch.lang index 5cf4a53c..7385a005 100644 --- a/Languages/dutch.lang +++ b/Languages/dutch.lang @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-29 12:52-0400\n" +"POT-Creation-Date: 2009-07-29 22:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n" "Last-Translator: tj_cool\n" "Language-Team: \n" @@ -379,6 +379,9 @@ msgstr "Wil je 30 sec. lang opnieuw proberen?" msgid "Do you want to use the alt dol that is known to be correct?" msgstr "Wil je de alt dol gebruiken waarvan is bevestigd dat deze werkt?" +msgid "Do you wish to update/download all language files?" +msgstr "" + msgid "Dol Path" msgstr "Locatie dol" @@ -991,6 +994,12 @@ msgstr "Alles updaten" msgid "Update DOL" msgstr "DOL updaten" +msgid "Update Files" +msgstr "" + +msgid "Update all Languagefiles" +msgstr "" + msgid "Update failed" msgstr "Update mislukt" @@ -1006,13 +1015,7 @@ msgstr "Updatelocatie gewijzigd." msgid "Updating" msgstr "Updaten" -msgid "Updating Language Files" -msgstr "" - -msgid "Updating Language files" -msgstr "" - -msgid "Updating WiiTDB.zip" +msgid "Updating Languagefiles:" msgstr "" msgid "VIDTV Patch" diff --git a/Languages/english.lang b/Languages/english.lang index bc43bb83..607e6211 100644 --- a/Languages/english.lang +++ b/Languages/english.lang @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-29 12:52-0400\n" +"POT-Creation-Date: 2009-07-29 22:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -379,6 +379,9 @@ msgstr "" msgid "Do you want to use the alt dol that is known to be correct?" msgstr "" +msgid "Do you wish to update/download all language files?" +msgstr "" + msgid "Dol Path" msgstr "" @@ -991,6 +994,12 @@ msgstr "" msgid "Update DOL" msgstr "" +msgid "Update Files" +msgstr "" + +msgid "Update all Languagefiles" +msgstr "" + msgid "Update failed" msgstr "" @@ -1006,13 +1015,7 @@ msgstr "" msgid "Updating" msgstr "" -msgid "Updating Language Files" -msgstr "" - -msgid "Updating Language files" -msgstr "" - -msgid "Updating WiiTDB.zip" +msgid "Updating Languagefiles:" msgstr "" msgid "VIDTV Patch" diff --git a/Languages/finnish.lang b/Languages/finnish.lang index e1c8ed39..8876dd71 100644 --- a/Languages/finnish.lang +++ b/Languages/finnish.lang @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-29 12:52-0400\n" +"POT-Creation-Date: 2009-07-29 22:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -379,6 +379,9 @@ msgstr "Haluatko odottaa 30 sekuntia?" msgid "Do you want to use the alt dol that is known to be correct?" msgstr "" +msgid "Do you wish to update/download all language files?" +msgstr "" + msgid "Dol Path" msgstr "" @@ -991,6 +994,12 @@ msgstr "" msgid "Update DOL" msgstr "" +msgid "Update Files" +msgstr "" + +msgid "Update all Languagefiles" +msgstr "" + msgid "Update failed" msgstr "" @@ -1006,13 +1015,7 @@ msgstr "" msgid "Updating" msgstr "" -msgid "Updating Language Files" -msgstr "" - -msgid "Updating Language files" -msgstr "" - -msgid "Updating WiiTDB.zip" +msgid "Updating Languagefiles:" msgstr "" msgid "VIDTV Patch" diff --git a/Languages/french.lang b/Languages/french.lang index 4e3068f4..5c8f0f8d 100644 --- a/Languages/french.lang +++ b/Languages/french.lang @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-29 12:52-0400\n" +"POT-Creation-Date: 2009-07-29 22:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n" "Last-Translator: Kin8\n" "Language-Team: Badablek, Amour, ikya, OuahOuah, dj_skual & Kin8\n" @@ -379,6 +379,9 @@ msgstr "Réessayer pendant 30 sec. ?" msgid "Do you want to use the alt dol that is known to be correct?" msgstr "Voulez-vous utiliser le DOL Alternatif actuellement connu comme correct ? " +msgid "Do you wish to update/download all language files?" +msgstr "" + msgid "Dol Path" msgstr "Dossier DOL Alternatif" @@ -991,6 +994,12 @@ msgstr "Totale" msgid "Update DOL" msgstr "DOL seul" +msgid "Update Files" +msgstr "" + +msgid "Update all Languagefiles" +msgstr "" + msgid "Update failed" msgstr "Mise à Jour échouée" @@ -1006,13 +1015,7 @@ msgstr "Dossier de Mise à Jour changé." msgid "Updating" msgstr "Mise à Jour" -msgid "Updating Language Files" -msgstr "" - -msgid "Updating Language files" -msgstr "" - -msgid "Updating WiiTDB.zip" +msgid "Updating Languagefiles:" msgstr "" msgid "VIDTV Patch" diff --git a/Languages/german.lang b/Languages/german.lang index cdfd243e..86e789b2 100644 --- a/Languages/german.lang +++ b/Languages/german.lang @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-29 12:52-0400\n" +"POT-Creation-Date: 2009-07-29 22:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -379,6 +379,9 @@ msgstr "In 30 sek erneut versuchen?" msgid "Do you want to use the alt dol that is known to be correct?" msgstr "Möchten Sie eine als richtig bekannte alt dol verwenden? " +msgid "Do you wish to update/download all language files?" +msgstr "" + msgid "Dol Path" msgstr "Dolpfad" @@ -991,6 +994,12 @@ msgstr "Aktualisiere alles" msgid "Update DOL" msgstr "Aktualisiere DOL" +msgid "Update Files" +msgstr "" + +msgid "Update all Languagefiles" +msgstr "" + msgid "Update failed" msgstr "Aktualisierung fehgeschlagen" @@ -1006,13 +1015,7 @@ msgstr "Aktualisierungspfad geändert." msgid "Updating" msgstr "Aktualisiere" -msgid "Updating Language Files" -msgstr "" - -msgid "Updating Language files" -msgstr "" - -msgid "Updating WiiTDB.zip" +msgid "Updating Languagefiles:" msgstr "" msgid "VIDTV Patch" diff --git a/Languages/hungarian.lang b/Languages/hungarian.lang index 75a937dc..93b66504 100644 --- a/Languages/hungarian.lang +++ b/Languages/hungarian.lang @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-29 12:52-0400\n" +"POT-Creation-Date: 2009-07-29 22:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n" "Last-Translator: Tusk\n" "Language-Team: \n" @@ -379,6 +379,9 @@ msgstr "30 másodpercig szeretnéd még tovább próbálni?" msgid "Do you want to use the alt dol that is known to be correct?" msgstr "" +msgid "Do you wish to update/download all language files?" +msgstr "" + msgid "Dol Path" msgstr "Dol útvonal" @@ -991,6 +994,12 @@ msgstr "Minden Frissítése" msgid "Update DOL" msgstr "DOL Frissítése" +msgid "Update Files" +msgstr "" + +msgid "Update all Languagefiles" +msgstr "" + msgid "Update failed" msgstr "Frissítési hiba" @@ -1006,13 +1015,7 @@ msgstr "Frissítés útvonala megváltozott." msgid "Updating" msgstr "Frissítés" -msgid "Updating Language Files" -msgstr "" - -msgid "Updating Language files" -msgstr "" - -msgid "Updating WiiTDB.zip" +msgid "Updating Languagefiles:" msgstr "" msgid "VIDTV Patch" diff --git a/Languages/italian.lang b/Languages/italian.lang index c280dcdd..85bac6c2 100644 --- a/Languages/italian.lang +++ b/Languages/italian.lang @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-29 12:52-0400\n" +"POT-Creation-Date: 2009-07-29 22:18+0200\n" "PO-Revision-Date: 2009-07-24 11:00+0200\n" "Last-Translator: Cambo \n" "Language-Team: FoxeJoe & Cambo\n" @@ -379,6 +379,9 @@ msgstr "Vuoi riprovare per 30 sec?" msgid "Do you want to use the alt dol that is known to be correct?" msgstr "Vuoi utilizzare il dol alternativo funzionante?" +msgid "Do you wish to update/download all language files?" +msgstr "" + msgid "Dol Path" msgstr "Percorso DOL" @@ -992,6 +995,12 @@ msgstr "Tutti i files" msgid "Update DOL" msgstr "Solo DOL" +msgid "Update Files" +msgstr "" + +msgid "Update all Languagefiles" +msgstr "" + msgid "Update failed" msgstr "Aggiornamento Fallito" @@ -1007,13 +1016,7 @@ msgstr "Perc. Aggiornamento Modificato" msgid "Updating" msgstr "Aggiornamento" -msgid "Updating Language Files" -msgstr "" - -msgid "Updating Language files" -msgstr "" - -msgid "Updating WiiTDB.zip" +msgid "Updating Languagefiles:" msgstr "" msgid "VIDTV Patch" diff --git a/Languages/japanese.lang b/Languages/japanese.lang index 243dbc87..7609616a 100644 --- a/Languages/japanese.lang +++ b/Languages/japanese.lang @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-29 12:52-0400\n" +"POT-Creation-Date: 2009-07-29 22:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -379,6 +379,9 @@ msgstr "再実行しますか?(30秒)" msgid "Do you want to use the alt dol that is known to be correct?" msgstr "" +msgid "Do you wish to update/download all language files?" +msgstr "" + msgid "Dol Path" msgstr "" @@ -991,6 +994,12 @@ msgstr "全てを更新" msgid "Update DOL" msgstr "DOLファイルを更新" +msgid "Update Files" +msgstr "" + +msgid "Update all Languagefiles" +msgstr "" + msgid "Update failed" msgstr "更新に失敗しました" @@ -1006,13 +1015,7 @@ msgstr "更新Pathを変更しました" msgid "Updating" msgstr "更新中" -msgid "Updating Language Files" -msgstr "" - -msgid "Updating Language files" -msgstr "" - -msgid "Updating WiiTDB.zip" +msgid "Updating Languagefiles:" msgstr "" msgid "VIDTV Patch" diff --git a/Languages/korean.lang b/Languages/korean.lang index 2add7126..09d3e8a5 100644 --- a/Languages/korean.lang +++ b/Languages/korean.lang @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-29 12:52-0400\n" +"POT-Creation-Date: 2009-07-29 22:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -379,6 +379,9 @@ msgstr "30초간 재시도 할까요?" msgid "Do you want to use the alt dol that is known to be correct?" msgstr "" +msgid "Do you wish to update/download all language files?" +msgstr "" + msgid "Dol Path" msgstr "" @@ -991,6 +994,12 @@ msgstr "" msgid "Update DOL" msgstr "" +msgid "Update Files" +msgstr "" + +msgid "Update all Languagefiles" +msgstr "" + msgid "Update failed" msgstr "" @@ -1006,13 +1015,7 @@ msgstr "" msgid "Updating" msgstr "" -msgid "Updating Language Files" -msgstr "" - -msgid "Updating Language files" -msgstr "" - -msgid "Updating WiiTDB.zip" +msgid "Updating Languagefiles:" msgstr "" msgid "VIDTV Patch" diff --git a/Languages/norwegian.lang b/Languages/norwegian.lang index b2b2fd3e..fff38b46 100644 --- a/Languages/norwegian.lang +++ b/Languages/norwegian.lang @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-29 12:52-0400\n" +"POT-Creation-Date: 2009-07-29 22:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -379,6 +379,9 @@ msgstr "Vil du fortsette å prøve i 30 sekunder?" msgid "Do you want to use the alt dol that is known to be correct?" msgstr "Vil du bruke alt DOL filen som er kjent for å være riktig?" +msgid "Do you wish to update/download all language files?" +msgstr "" + msgid "Dol Path" msgstr "DOL sti" @@ -991,6 +994,12 @@ msgstr "Oppdater alt" msgid "Update DOL" msgstr "Oppdater DOL" +msgid "Update Files" +msgstr "" + +msgid "Update all Languagefiles" +msgstr "" + msgid "Update failed" msgstr "Mislykket oppdatering" @@ -1006,13 +1015,7 @@ msgstr "Oppdatering sti endret." msgid "Updating" msgstr "Oppdaterer" -msgid "Updating Language Files" -msgstr "" - -msgid "Updating Language files" -msgstr "" - -msgid "Updating WiiTDB.zip" +msgid "Updating Languagefiles:" msgstr "" msgid "VIDTV Patch" diff --git a/Languages/polish.lang b/Languages/polish.lang index 698e1e8c..5428a275 100644 --- a/Languages/polish.lang +++ b/Languages/polish.lang @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-29 12:52-0400\n" +"POT-Creation-Date: 2009-07-29 22:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n" "Last-Translator: ziom666 (zadania_prog@vp.pl)\n" "Language-Team: \n" @@ -379,6 +379,9 @@ msgstr "Powtórzyc za 30 sec?" msgid "Do you want to use the alt dol that is known to be correct?" msgstr "Uzyc alternatywny plik DOL?" +msgid "Do you wish to update/download all language files?" +msgstr "" + msgid "Dol Path" msgstr "Sciezka plików .DOL" @@ -991,6 +994,12 @@ msgstr "Zaktualizuj wszystko" msgid "Update DOL" msgstr "Zaktualizuj Dol" +msgid "Update Files" +msgstr "" + +msgid "Update all Languagefiles" +msgstr "" + msgid "Update failed" msgstr "Nie udalo sie zaktualizowac" @@ -1006,13 +1015,7 @@ msgstr "Zmieniono Sciezke aktualizacji" msgid "Updating" msgstr "Aktualizowanie" -msgid "Updating Language Files" -msgstr "" - -msgid "Updating Language files" -msgstr "" - -msgid "Updating WiiTDB.zip" +msgid "Updating Languagefiles:" msgstr "" msgid "VIDTV Patch" diff --git a/Languages/portuguese_br.lang b/Languages/portuguese_br.lang index 35a56ea1..d674877a 100644 --- a/Languages/portuguese_br.lang +++ b/Languages/portuguese_br.lang @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-29 12:52-0400\n" +"POT-Creation-Date: 2009-07-29 22:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -379,6 +379,9 @@ msgstr "Deseja tentar novamente em 30s?" msgid "Do you want to use the alt dol that is known to be correct?" msgstr "" +msgid "Do you wish to update/download all language files?" +msgstr "" + msgid "Dol Path" msgstr "" @@ -991,6 +994,12 @@ msgstr "Atualizar Tudo" msgid "Update DOL" msgstr "Atualizar arquivo .dol" +msgid "Update Files" +msgstr "" + +msgid "Update all Languagefiles" +msgstr "" + msgid "Update failed" msgstr "Falhar ao atualizar" @@ -1006,13 +1015,7 @@ msgstr "Local Atualizações alterado." msgid "Updating" msgstr "Atualizando..." -msgid "Updating Language Files" -msgstr "" - -msgid "Updating Language files" -msgstr "" - -msgid "Updating WiiTDB.zip" +msgid "Updating Languagefiles:" msgstr "" msgid "VIDTV Patch" diff --git a/Languages/portuguese_pt.lang b/Languages/portuguese_pt.lang index dd80ff86..00004a74 100644 --- a/Languages/portuguese_pt.lang +++ b/Languages/portuguese_pt.lang @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-29 12:52-0400\n" +"POT-Creation-Date: 2009-07-29 22:18+0200\n" "PO-Revision-Date: 2009-07-20 16:40\n" "Last-Translator: Sky8000\n" "Language-Team: \n" @@ -379,6 +379,9 @@ msgstr "Deseja tentar novamente dentro de 30 segs?" msgid "Do you want to use the alt dol that is known to be correct?" msgstr "Queres usar o dol alternativo que se pensa ser o correcto?" +msgid "Do you wish to update/download all language files?" +msgstr "" + msgid "Dol Path" msgstr "Pasta DOL" @@ -991,6 +994,12 @@ msgstr "Actualizar Tudo" msgid "Update DOL" msgstr "Actualizar DOL" +msgid "Update Files" +msgstr "" + +msgid "Update all Languagefiles" +msgstr "" + msgid "Update failed" msgstr "Erro ao actualizar" @@ -1006,13 +1015,7 @@ msgstr "A pasta das actualizações foi alterada." msgid "Updating" msgstr "Actualizando" -msgid "Updating Language Files" -msgstr "" - -msgid "Updating Language files" -msgstr "" - -msgid "Updating WiiTDB.zip" +msgid "Updating Languagefiles:" msgstr "" msgid "VIDTV Patch" diff --git a/Languages/russian.lang b/Languages/russian.lang index a66de26f..f37517d7 100644 --- a/Languages/russian.lang +++ b/Languages/russian.lang @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-29 12:52-0400\n" +"POT-Creation-Date: 2009-07-29 22:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n" "Last-Translator: Kir\n" "Language-Team: Kir\n" @@ -379,6 +379,9 @@ msgstr "Хотите попробовать еще раз на 30 секунд?" msgid "Do you want to use the alt dol that is known to be correct?" msgstr "" +msgid "Do you wish to update/download all language files?" +msgstr "" + msgid "Dol Path" msgstr "Путь к DOL" @@ -991,6 +994,12 @@ msgstr "Обновить всё" msgid "Update DOL" msgstr "Обновить DOL" +msgid "Update Files" +msgstr "" + +msgid "Update all Languagefiles" +msgstr "" + msgid "Update failed" msgstr "Обновление не удалось" @@ -1006,13 +1015,7 @@ msgstr "Путь к обновлениям изменен" msgid "Updating" msgstr "обновляю" -msgid "Updating Language Files" -msgstr "" - -msgid "Updating Language files" -msgstr "" - -msgid "Updating WiiTDB.zip" +msgid "Updating Languagefiles:" msgstr "" msgid "VIDTV Patch" diff --git a/Languages/schinese.lang b/Languages/schinese.lang index 1a05b141..7f2e4c69 100644 --- a/Languages/schinese.lang +++ b/Languages/schinese.lang @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-29 12:52-0400\n" +"POT-Creation-Date: 2009-07-29 22:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -379,6 +379,9 @@ msgstr "是否等待30秒重试?" msgid "Do you want to use the alt dol that is known to be correct?" msgstr "" +msgid "Do you wish to update/download all language files?" +msgstr "" + msgid "Dol Path" msgstr "" @@ -991,6 +994,12 @@ msgstr "" msgid "Update DOL" msgstr "" +msgid "Update Files" +msgstr "" + +msgid "Update all Languagefiles" +msgstr "" + msgid "Update failed" msgstr "" @@ -1006,13 +1015,7 @@ msgstr "" msgid "Updating" msgstr "" -msgid "Updating Language Files" -msgstr "" - -msgid "Updating Language files" -msgstr "" - -msgid "Updating WiiTDB.zip" +msgid "Updating Languagefiles:" msgstr "" msgid "VIDTV Patch" diff --git a/Languages/spanish.lang b/Languages/spanish.lang index bad11466..7ecdbbbc 100644 --- a/Languages/spanish.lang +++ b/Languages/spanish.lang @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-29 12:52-0400\n" +"POT-Creation-Date: 2009-07-29 22:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -379,6 +379,9 @@ msgstr "¿Quieres reintentar por 30 segs.?" msgid "Do you want to use the alt dol that is known to be correct?" msgstr "¿Quieres usar el dol alternativo que se sabe es correcto?" +msgid "Do you wish to update/download all language files?" +msgstr "" + msgid "Dol Path" msgstr "Ruta Dol" @@ -991,6 +994,12 @@ msgstr "Actualizar Todo" msgid "Update DOL" msgstr "Actualizar DOL" +msgid "Update Files" +msgstr "" + +msgid "Update all Languagefiles" +msgstr "" + msgid "Update failed" msgstr "Fallo en la Actualización" @@ -1006,13 +1015,7 @@ msgstr "Ruta Actualización cambiada." msgid "Updating" msgstr "Actualizando" -msgid "Updating Language Files" -msgstr "" - -msgid "Updating Language files" -msgstr "" - -msgid "Updating WiiTDB.zip" +msgid "Updating Languagefiles:" msgstr "" msgid "VIDTV Patch" diff --git a/Languages/swedish.lang b/Languages/swedish.lang index 9d6f0d1a..4f16e2f3 100644 --- a/Languages/swedish.lang +++ b/Languages/swedish.lang @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-29 12:52-0400\n" +"POT-Creation-Date: 2009-07-29 22:18+0200\n" "PO-Revision-Date: 2009-07-27 12:20+0200\n" "Last-Translator: Katsurou\n" "Language-Team: Katsurou, pirateX\n" @@ -379,6 +379,9 @@ msgstr "Vill du försöka igen i 30 sekunder?" msgid "Do you want to use the alt dol that is known to be correct?" msgstr "Vill du använda en alternativ dol som är känd att fungera?" +msgid "Do you wish to update/download all language files?" +msgstr "" + msgid "Dol Path" msgstr "Dol sökväg" @@ -991,6 +994,12 @@ msgstr "Uppdatera alla" msgid "Update DOL" msgstr "Updatera DOL" +msgid "Update Files" +msgstr "" + +msgid "Update all Languagefiles" +msgstr "" + msgid "Update failed" msgstr "Uppdatering misslyckades" @@ -1006,13 +1015,7 @@ msgstr "Sökväg till uppdatering ändrad." msgid "Updating" msgstr "Uppdaterar" -msgid "Updating Language Files" -msgstr "" - -msgid "Updating Language files" -msgstr "" - -msgid "Updating WiiTDB.zip" +msgid "Updating Languagefiles:" msgstr "" msgid "VIDTV Patch" diff --git a/Languages/tchinese.lang b/Languages/tchinese.lang index 3e53aceb..486e9afa 100644 --- a/Languages/tchinese.lang +++ b/Languages/tchinese.lang @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-29 12:52-0400\n" +"POT-Creation-Date: 2009-07-29 22:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -379,6 +379,9 @@ msgstr "是否等待30秒重試?" msgid "Do you want to use the alt dol that is known to be correct?" msgstr "使用已知為正確的替代DOL?" +msgid "Do you wish to update/download all language files?" +msgstr "" + msgid "Dol Path" msgstr "Dol路徑" @@ -991,6 +994,12 @@ msgstr "升級所有檔案" msgid "Update DOL" msgstr "僅升級dol" +msgid "Update Files" +msgstr "" + +msgid "Update all Languagefiles" +msgstr "" + msgid "Update failed" msgstr "更新失敗" @@ -1006,13 +1015,7 @@ msgstr "更新路徑已變更" msgid "Updating" msgstr "正在更新" -msgid "Updating Language Files" -msgstr "" - -msgid "Updating Language files" -msgstr "" - -msgid "Updating WiiTDB.zip" +msgid "Updating Languagefiles:" msgstr "" msgid "VIDTV Patch" diff --git a/Languages/turkish.lang b/Languages/turkish.lang index b6643606..ab7e313b 100644 --- a/Languages/turkish.lang +++ b/Languages/turkish.lang @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-29 12:52-0400\n" +"POT-Creation-Date: 2009-07-29 22:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -379,6 +379,9 @@ msgstr "30 saniye sonra denemek ister misiniz?" msgid "Do you want to use the alt dol that is known to be correct?" msgstr "" +msgid "Do you wish to update/download all language files?" +msgstr "" + msgid "Dol Path" msgstr "" @@ -991,6 +994,12 @@ msgstr "" msgid "Update DOL" msgstr "" +msgid "Update Files" +msgstr "" + +msgid "Update all Languagefiles" +msgstr "" + msgid "Update failed" msgstr "" @@ -1006,13 +1015,7 @@ msgstr "" msgid "Updating" msgstr "" -msgid "Updating Language Files" -msgstr "" - -msgid "Updating Language files" -msgstr "" - -msgid "Updating WiiTDB.zip" +msgid "Updating Languagefiles:" msgstr "" msgid "VIDTV Patch" diff --git a/source/homebrewboot/HomebrewFiles.cpp b/source/homebrewboot/HomebrewFiles.cpp index 4fea3226..a3ff0551 100644 --- a/source/homebrewboot/HomebrewFiles.cpp +++ b/source/homebrewboot/HomebrewFiles.cpp @@ -12,12 +12,24 @@ HomebrewFiles::HomebrewFiles(const char * path) { filecount = 0; + + FileInfo = (FileInfos *) malloc(sizeof(FileInfos)); + if(!FileInfo) { + return; + } + + memset(&FileInfo[filecount], 0, sizeof(FileInfos)); + this->LoadPath(path); this->SortList(); } HomebrewFiles::~HomebrewFiles() { + if(FileInfo) { + free(FileInfo); + FileInfo = NULL; + } } bool HomebrewFiles::LoadPath(const char * folderpath) @@ -48,6 +60,18 @@ bool HomebrewFiles::LoadPath(const char * folderpath) if((strncasecmp(temp, ".dol", 4) == 0 || strncasecmp(temp, ".elf", 4) == 0) && filecount < MAXHOMEBREWS && filename[0]!='.') { + FileInfo = (FileInfos *) realloc(FileInfo, (filecount+1)*sizeof(FileInfos)); + + if(!FileInfo) { + free(FileInfo); + FileInfo = NULL; + filecount = 0; + dirclose(dir); + return false; + } + + memset(&(FileInfo[filecount]), 0, sizeof(FileInfo)); + strncpy(FileInfo[filecount].FilePath, folderpath, sizeof(FileInfo[filecount].FilePath)); strncpy(FileInfo[filecount].FileName, filename, sizeof(FileInfo[filecount].FileName)); FileInfo[filecount].FileSize = st.st_size; @@ -78,7 +102,7 @@ char * HomebrewFiles::GetFilepath(int ind) unsigned int HomebrewFiles::GetFilesize(int ind) { - if(ind > filecount) + if(ind > filecount || !filecount || !FileInfo) return NULL; else return FileInfo[ind].FileSize; @@ -89,7 +113,7 @@ int HomebrewFiles::GetFilecount() return filecount; } -int ListCompare(const void *a, const void *b) +static int ListCompare(const void *a, const void *b) { FileInfos *ab = (FileInfos*) a; FileInfos *bb = (FileInfos*) b; diff --git a/source/homebrewboot/HomebrewFiles.h b/source/homebrewboot/HomebrewFiles.h index 8aa9ec66..4fd0082d 100644 --- a/source/homebrewboot/HomebrewFiles.h +++ b/source/homebrewboot/HomebrewFiles.h @@ -5,7 +5,7 @@ #ifndef ___HOMEBREWFILES_H_ #define ___HOMEBREWFILES_H_ -#define MAXHOMEBREWS 300 +#define MAXHOMEBREWS 500 typedef struct { char FileName[100]; @@ -39,7 +39,7 @@ class HomebrewFiles void SortList(); protected: int filecount; - FileInfos FileInfo[MAXHOMEBREWS]; + FileInfos *FileInfo; }; #endif diff --git a/source/main.cpp b/source/main.cpp index e32a9a74..17d12908 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -16,8 +16,7 @@ #include #include -#include "usbloader/wbfs.h" -#include "usbloader/video2.h" +#include "usbloader/wbfs.h" #include "settings/cfg.h" #include "language/gettext.h" #include "mload/mload.h" diff --git a/source/network/URL_List.cpp b/source/network/URL_List.cpp new file mode 100644 index 00000000..8e37437d --- /dev/null +++ b/source/network/URL_List.cpp @@ -0,0 +1,138 @@ +/**************************************************************************** + * URL List Class + * for USB Loader GX + * by dimok + ***************************************************************************/ +#include +#include +#include +#include + +#include "URL_List.h" + + +URL_List::URL_List(const char * url) +{ + Links = NULL; + urlcount = 0; + + if(!IsNetworkInit()) { + urlcount = -1; + return; + } + + struct block file = downloadfile(url); + + if(!file.data || !file.size) { + urlcount = -2; + return; + } + + u32 cnt = 0; + char temp[1024]; + + Links = (Link_Info *) malloc(sizeof(Link_Info)); + if(!Links) { + free(file.data); + urlcount = -3; + return; + } + + memset(&Links[urlcount], 0, sizeof(Link_Info)); + + while(cnt < file.size) { + + if(file.data[cnt] == '"' && file.data[cnt-1] == '=' && file.data[cnt-2] == 'f' + && file.data[cnt-3] == 'e' && file.data[cnt-4] == 'r' && file.data[cnt-5] == 'h') { + + u32 cnt2 = 0; + cnt++; + while(file.data[cnt] != '"' && cnt2 < 1024) { + temp[cnt2] = file.data[cnt]; + cnt2++; + cnt++; + } + temp[cnt2] = '\0'; + + Links = (Link_Info *) realloc(Links, (urlcount+1)*sizeof(Link_Info)); + + if(!Links) { + for(int i = 0; i == urlcount; i++) { + delete Links[i].URL; + Links[i].URL = NULL; + } + free(Links); + Links = NULL; + free(file.data); + urlcount = -4; + break; + } + + memset(&(Links[urlcount]), 0, sizeof(Link_Info)); + + Links[urlcount].URL = new char[cnt2+1]; + + if(!Links[urlcount].URL) { + for(int i = 0; i == urlcount; i++) { + delete Links[i].URL; + Links[i].URL = NULL; + } + free(Links); + Links = NULL; + free(file.data); + urlcount = -5; + break; + } + + snprintf(Links[urlcount].URL, cnt2+1, "%s", temp); + + if(strncmp(Links[urlcount].URL, "http://", strlen("http://")) != 0) + Links[urlcount].direct = false; + else + Links[urlcount].direct = true; + + urlcount++; + } + cnt++; + } + + free(file.data); +} + +URL_List::~URL_List() +{ + for(int i = 0; i == urlcount; i++) { + delete Links[i].URL; + Links[i].URL = NULL; + } + + if(Links != NULL) { + free(Links); + Links = NULL; + } +} + +char * URL_List::GetURL(int ind) +{ + if(ind > urlcount || ind < 0 || !Links || urlcount <= 0) + return NULL; + else + return Links[ind].URL; +} + +int URL_List::GetURLCount() +{ + return urlcount; +} + +static int ListCompare(const void *a, const void *b) +{ + Link_Info *ab = (Link_Info*) a; + Link_Info *bb = (Link_Info*) b; + + return stricmp((char *) ab->URL, (char *) bb->URL); +} +void URL_List::SortList() +{ + qsort(Links, urlcount, sizeof(Link_Info), ListCompare); +} diff --git a/source/network/URL_List.h b/source/network/URL_List.h new file mode 100644 index 00000000..7024df8a --- /dev/null +++ b/source/network/URL_List.h @@ -0,0 +1,39 @@ +/**************************************************************************** + * URL List Class + * for USB Loader GX + * by dimok + ***************************************************************************/ +#ifndef ___URLLIST_H_ +#define ___URLLIST_H_ + +#include "network/networkops.h" +#include "network/http.h" + +typedef struct { + char *URL; + bool direct; +} Link_Info; + +class URL_List +{ + public: + //!Constructor + //!\param url from where to get the list of links + URL_List(const char *url); + //!Destructor + ~URL_List(); + //! Get the a filepath of the list + //!\param list index + char * GetURL(int index); + //! Is it a direct URL or just a file or path under the main url + bool IsDirectURL(int index); + //! Get the number of links counted + int GetURLCount(); + //! Sort list + void SortList(); + protected: + int urlcount; + Link_Info *Links; +}; + +#endif diff --git a/source/prompts/ProgressWindow.cpp b/source/prompts/ProgressWindow.cpp index b6b7d034..2de25076 100644 --- a/source/prompts/ProgressWindow.cpp +++ b/source/prompts/ProgressWindow.cpp @@ -25,6 +25,7 @@ static char progressMsg2[150]; static char progressTime[80]; static char progressSizeLeft[80]; static char progressSpeed[15]; +static char *dyn_message; static int showProgress = 0; static f32 progressDone = 0.0; static bool showTime = false; @@ -86,7 +87,7 @@ static void GameInstallProgress() { snprintf(progressTime, sizeof(progressTime), "%s %d:%02d:%02d",tr("Time left:"),h,m,s); snprintf(progressSizeLeft, sizeof(progressSizeLeft), "%.2fGB/%.2fGB", gamesize * gameinstalldone/gameinstalltotal, gamesize); - snprintf(progressSpeed, sizeof(progressSpeed), "%.1fMB/s", speed); + snprintf(progressSpeed, sizeof(progressSpeed), "%.1fMB/s", speed); } @@ -183,7 +184,7 @@ static void ProgressWindow(const char *title, const char *msg1, const char *msg2 sizeTxt.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); sizeTxt.SetPosition(50, -50); - GuiText speedTxt(NULL, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); + GuiText speedTxt(NULL, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); speedTxt.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); speedTxt.SetPosition(50, -74); @@ -228,8 +229,8 @@ static void ProgressWindow(const char *title, const char *msg1, const char *msg2 promptWindow.Append(&timeTxt); if(showSize){ promptWindow.Append(&sizeTxt); - promptWindow.Append(&speedTxt); - } + promptWindow.Append(&speedTxt); + } HaltGui(); promptWindow.SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_IN, 50); @@ -249,9 +250,7 @@ static void ProgressWindow(const char *title, const char *msg1, const char *msg2 usleep(20000); GameInstallProgress(); - tmp=static_cast(progressbarImg.GetWidth()*progressDone); - - + tmp = static_cast(progressbarImg.GetWidth()*progressDone); if(CFG.widescreen && Settings.wsprompt == yes) progressbarImg.SetSkew(0,0,static_cast(progressbarImg.GetWidth()*progressDone*0.8)-progressbarImg.GetWidth(),0,static_cast(progressbarImg.GetWidth()*progressDone*0.8)-progressbarImg.GetWidth(),0,0,0); @@ -262,10 +261,14 @@ static void ProgressWindow(const char *title, const char *msg1, const char *msg2 if(showSize){ sizeTxt.SetText(progressSizeLeft); - speedTxt.SetText(progressSpeed); - } + speedTxt.SetText(progressSpeed); + } + if(showTime) timeTxt.SetText(progressTime); + + if(msg2) + msg2Txt.SetText(dyn_message); } promptWindow.SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_OUT, 50); @@ -313,7 +316,7 @@ void ProgressStop() * Callbackfunction for updating the progress values * Use this function as standard callback ***************************************************************************/ -void ShowProgress(const char *title, const char *msg1, const char *msg2, f32 done, f32 total, bool swSize, bool swTime) +void ShowProgress(const char *title, const char *msg1, char *dynmsg2, f32 done, f32 total, bool swSize, bool swTime) { if(total <= 0) return; @@ -328,8 +331,8 @@ void ShowProgress(const char *title, const char *msg1, const char *msg2, f32 don strncpy(progressTitle, title, sizeof(progressTitle)); if(msg1) strncpy(progressMsg1, msg1, sizeof(progressMsg1)); - if(msg2) - strncpy(progressMsg2, msg2, sizeof(progressMsg2)); + if(dynmsg2) + dyn_message = dynmsg2; if(swTime == true) { static u32 expected; diff --git a/source/prompts/ProgressWindow.h b/source/prompts/ProgressWindow.h index 38c3948b..e345615c 100644 --- a/source/prompts/ProgressWindow.h +++ b/source/prompts/ProgressWindow.h @@ -15,7 +15,7 @@ void InitProgressThread(); void ExitProgressThread(); void SetupGameInstallProgress(char * titl, char * game); -void ShowProgress (const char *title, const char *msg1, const char *msg2, +void ShowProgress (const char *title, const char *msg1, char *dynmsg2, f32 done, f32 total, bool swSize = false, bool swTime = false); void ProgressStop(); diff --git a/source/prompts/PromptWindows.cpp b/source/prompts/PromptWindows.cpp index 2ded9224..74794591 100644 --- a/source/prompts/PromptWindows.cpp +++ b/source/prompts/PromptWindows.cpp @@ -1800,6 +1800,100 @@ void SearchMissingImages(int choice2) return; } +/**************************************************************************** + * NetworkInitPrompt + ***************************************************************************/ +bool NetworkInitPrompt() +{ + bool success = true; + + GuiWindow promptWindow(472,320); + promptWindow.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); + promptWindow.SetPosition(0, -10); + + GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM, Settings.sfxvolume); + GuiSound btnClick(button_click2_pcm, button_click2_pcm_size, SOUND_PCM, Settings.sfxvolume); + + char imgPath[100]; + snprintf(imgPath, sizeof(imgPath), "%sbutton_dialogue_box.png", CFG.theme_path); + GuiImageData btnOutline(imgPath, button_dialogue_box_png); + snprintf(imgPath, sizeof(imgPath), "%sdialogue_box.png", CFG.theme_path); + GuiImageData dialogBox(imgPath, dialogue_box_png); + GuiTrigger trigA; + trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); + + GuiImage dialogBoxImg(&dialogBox); + + if (Settings.wsprompt == yes){ + dialogBoxImg.SetWidescreen(CFG.widescreen); + } + + GuiText titleTxt(tr("Initializing Network"), 26, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); + titleTxt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); + titleTxt.SetPosition(0,60); + + char msg[20] = " "; + GuiText msgTxt(msg, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); + msgTxt.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); + msgTxt.SetPosition(0,-40); + + GuiText btn1Txt(tr("Cancel"), 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); + GuiImage btn1Img(&btnOutline); + if (Settings.wsprompt == yes){ + btn1Txt.SetWidescreen(CFG.widescreen); + btn1Img.SetWidescreen(CFG.widescreen); + } + GuiButton btn1(&btn1Img,&btn1Img, 2, 4, 0, -45, &trigA, &btnSoundOver, &btnClick,1); + btn1.SetLabel(&btn1Txt); + btn1.SetState(STATE_SELECTED); + + if ((Settings.wsprompt == yes) && (CFG.widescreen)){/////////////adjust buttons for widescreen + btn1.SetAlignment(ALIGN_CENTRE, ALIGN_BOTTOM); + btn1.SetPosition(0, -80); + } + + promptWindow.Append(&dialogBoxImg); + promptWindow.Append(&titleTxt); + promptWindow.Append(&msgTxt); + promptWindow.Append(&btn1); + + promptWindow.SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_IN, 50); + HaltGui(); + mainWindow->SetState(STATE_DISABLED); + mainWindow->Append(&promptWindow); + mainWindow->ChangeFocus(&promptWindow); + ResumeGui(); + + while (!IsNetworkInit()) { + + VIDEO_WaitVSync(); + + Initialize_Network(); + + if (!IsNetworkInit()) { + msgTxt.SetText(tr("Could not initialize network!")); + sleep(3); + success = false; + break; + } + + if(btn1.GetState() == STATE_CLICKED) { + btn1.ResetState(); + success = false; + break; + } + } + + promptWindow.SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_OUT, 50); + while(promptWindow.GetEffect() > 0) usleep(50); + + HaltGui(); + mainWindow->Remove(&promptWindow); + mainWindow->SetState(STATE_DEFAULT); + ResumeGui(); + + return success; +} /**************************************************************************** * ProgressDownloadWindow diff --git a/source/prompts/PromptWindows.h b/source/prompts/PromptWindows.h index 3ae260aa..16e24369 100644 --- a/source/prompts/PromptWindows.h +++ b/source/prompts/PromptWindows.h @@ -24,12 +24,13 @@ int FormatingPartition(const char *title, partitionEntry *entry); void SearchMissingImages(int choice2); int ProgressDownloadWindow(int choice2); int ProgressUpdateWindow(); +bool NetworkInitPrompt(); char * GetMissingFiles(); int WindowScreensaver(); int CodeDownload(const char *id); void GetLanguageToLangCode(char *langcode); int HBCWindowPrompt(const char *name, const char *coder, const char *version, - const char *release_date, const char *long_description, + const char *release_date, const char *long_description, const char *iconPath, u64 filesize); diff --git a/source/settings/SettingsPrompts.cpp b/source/settings/SettingsPrompts.cpp index 3d919064..8320fcf8 100644 --- a/source/settings/SettingsPrompts.cpp +++ b/source/settings/SettingsPrompts.cpp @@ -4,9 +4,11 @@ #include "language/gettext.h" #include "prompts/PromptWindows.h" +#include "prompts/ProgressWindow.h" #include "libwiigui/gui.h" #include "libwiigui/gui_customoptionbrowser.h" #include "settings/cfg.h" +#include "network/URL_List.h" #include "listfiles.h" #include "main.h" #include "fatmounter.h" @@ -372,7 +374,7 @@ int MenuLanguageSelect() } GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); backBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); - backBtn.SetPosition(-180, 400); + backBtn.SetPosition(-190, 400); backBtn.SetLabel(&backBtnTxt); backBtn.SetImage(&backBtnImg); backBtn.SetSoundOver(&btnSoundOver); @@ -390,7 +392,7 @@ int MenuLanguageSelect() } GuiButton defaultBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); defaultBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); - defaultBtn.SetPosition(180, 400); + defaultBtn.SetPosition(190, 400); defaultBtn.SetLabel(&defaultBtnTxt); defaultBtn.SetImage(&defaultBtnImg); defaultBtn.SetSoundOver(&btnSoundOver); @@ -398,6 +400,23 @@ int MenuLanguageSelect() defaultBtn.SetTrigger(&trigA); defaultBtn.SetEffectGrow(); + GuiText updateBtnTxt(tr("Update Files") , 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); + updateBtnTxt.SetMaxWidth(btnOutline.GetWidth()-30); + GuiImage updateBtnImg(&btnOutline); + if (Settings.wsprompt == yes) { + updateBtnTxt.SetWidescreen(CFG.widescreen); + updateBtnImg.SetWidescreen(CFG.widescreen); + } + GuiButton updateBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); + updateBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); + updateBtn.SetPosition(0, 400); + updateBtn.SetLabel(&updateBtnTxt); + updateBtn.SetImage(&updateBtnImg); + updateBtn.SetSoundOver(&btnSoundOver); + updateBtn.SetSoundClick(&btnClick); + updateBtn.SetTrigger(&trigA); + updateBtn.SetEffectGrow(); + customOptionList options2(countfiles); for (cnt = 0; cnt < countfiles; cnt++) { @@ -426,6 +445,7 @@ int MenuLanguageSelect() w.Append(&pathBtn); w.Append(&backBtn); w.Append(&defaultBtn); + w.Append(&updateBtn); w.Append(&optionBrowser4); mainWindow->Append(&w); @@ -439,16 +459,16 @@ int MenuLanguageSelect() if(shutdown == 1) Sys_Shutdown(); - if(reset == 1) + else if(reset == 1) Sys_Reboot(); - if (backBtn.GetState() == STATE_CLICKED) { + else if (backBtn.GetState() == STATE_CLICKED) { backBtn.ResetState(); break; } - if (defaultBtn.GetState() == STATE_CLICKED) { + else if (defaultBtn.GetState() == STATE_CLICKED) { choice = WindowPrompt(tr("Loading standard language."),0,tr("OK"), tr("Cancel")); if (choice == 1) { sprintf(Settings.language_path, "notset"); @@ -462,7 +482,56 @@ int MenuLanguageSelect() optionBrowser4.SetFocus(1); } - if (pathBtn.GetState() == STATE_CLICKED) { + else if (updateBtn.GetState() == STATE_CLICKED) { + choice = WindowPrompt(tr("Update all Languagefiles"),tr("Do you wish to update/download all language files?"),tr("OK"), tr("Cancel")); + if (choice == 1) { + + bool network = true; + if(!IsNetworkInit()) { + network = NetworkInitPrompt(); + } + + if(network) { + const char URL[60] = "http://usbloader-gui.googlecode.com/svn/trunk/Languages/"; + char fullURL[300]; + FILE *pfile; + + URL_List LinkList(URL); + int listsize = LinkList.GetURLCount(); + + for(int i = 0; i < listsize; i++) { + + ShowProgress(tr("Updating Languagefiles:"), 0, LinkList.GetURL(i), i, listsize-1); + + if(strcasecmp(".lang", strrchr(LinkList.GetURL(i), '.')) == 0) { + + snprintf(fullURL, sizeof(fullURL), "%s%s", URL, LinkList.GetURL(i)); + + struct block file = downloadfile(fullURL); + + if(file.data && file.size) { + char filepath[300]; + + snprintf(filepath, sizeof(filepath), "%s%s", Settings.languagefiles_path, LinkList.GetURL(i)); + pfile = fopen(filepath, "wb"); + fwrite(file.data, 1, file.size, pfile); + fclose(pfile); + + } + + free(file.data); + } + } + ProgressStop(); + returnhere = 1; + break; + } + } + updateBtn.ResetState(); + optionBrowser4.SetFocus(1); + } + + else if (pathBtn.GetState() == STATE_CLICKED) { w.Remove(&optionBrowser4); w.Remove(&backBtn); w.Remove(&pathBtn); diff --git a/source/usbloader/video2.c b/source/usbloader/video2.c deleted file mode 100644 index 95b54103..00000000 --- a/source/usbloader/video2.c +++ /dev/null @@ -1,136 +0,0 @@ -#include -#include - -#include "sys.h" -#include "video2.h" - -/* Video variables */ -static void *framebuffer = NULL; -static GXRModeObj *vmode = NULL; - - -void Con_Init(u32 x, u32 y, u32 w, u32 h) -{ - /* Create console in the framebuffer */ - CON_InitEx(vmode, x, y, w, h); -} - -void Con_Clear(void) -{ - /* Clear console */ - printf("\x1b[2J"); - fflush(stdout); -} - -void Con_ClearLine(void) -{ - s32 cols, rows; - u32 cnt; - - printf("\r"); - fflush(stdout); - - /* Get console metrics */ - CON_GetMetrics(&cols, &rows); - - /* Erase line */ - for (cnt = 1; cnt < cols; cnt++) { - printf(" "); - fflush(stdout); - } - - printf("\r"); - fflush(stdout); -} - -void Con_FgColor(u32 color, u8 bold) -{ - /* Set foreground color */ - printf("\x1b[%u;%um", color + 30, bold); - fflush(stdout); -} - -void Con_BgColor(u32 color, u8 bold) -{ - /* Set background color */ - printf("\x1b[%u;%um", color + 40, bold); - fflush(stdout); -} - -void Con_FillRow(u32 row, u32 color, u8 bold) -{ - s32 cols, rows; - u32 cnt; - - /* Set color */ - printf("\x1b[%u;%um", color + 40, bold); - fflush(stdout); - - /* Get console metrics */ - CON_GetMetrics(&cols, &rows); - - /* Save current row and col */ - printf("\x1b[s"); - fflush(stdout); - - /* Move to specified row */ - printf("\x1b[%u;0H", row); - fflush(stdout); - - /* Fill row */ - for (cnt = 0; cnt < cols; cnt++) { - printf(" "); - fflush(stdout); - } - - /* Load saved row and col */ - printf("\x1b[u"); - fflush(stdout); - - /* Set default color */ - Con_BgColor(0, 0); - Con_FgColor(7, 1); -} - -void Video_Configure(GXRModeObj *rmode) -{ - /* Configure the video subsystem */ - VIDEO_Configure(rmode); - - /* Setup video */ - VIDEO_SetBlack(FALSE); - VIDEO_Flush(); - VIDEO_WaitVSync(); - - if (rmode->viTVMode & VI_NON_INTERLACE) - VIDEO_WaitVSync(); -} - -void Video_SetMode(void) -{ - /* Select preferred video mode */ - vmode = VIDEO_GetPreferredMode(NULL); - - /* Allocate memory for the framebuffer */ - framebuffer = MEM_K0_TO_K1(SYS_AllocateFramebuffer(vmode)); - - /* Configure the video subsystem */ - VIDEO_Configure(vmode); - - /* Setup video */ - VIDEO_SetNextFramebuffer(framebuffer); - VIDEO_SetBlack(FALSE); - VIDEO_Flush(); - VIDEO_WaitVSync(); - - if (vmode->viTVMode & VI_NON_INTERLACE) - VIDEO_WaitVSync(); - - /* Clear the screen */ - Video_Clear(COLOR_BLACK); -} - -void Video_Clear(s32 color) -{ - VIDEO_ClearFrameBuffer(vmode, framebuffer, color); -} diff --git a/source/usbloader/video2.h b/source/usbloader/video2.h deleted file mode 100644 index 01c5b04e..00000000 --- a/source/usbloader/video2.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef _VIDEO2_H_ -#define _VIDEO2_H_ - -#ifdef __cplusplus -extern "C" -{ -#endif - -/* Prototypes */ -void Con_Init(u32, u32, u32, u32); -void Con_Clear(void); -void Con_ClearLine(void); -void Con_FgColor(u32, u8); -void Con_BgColor(u32, u8); -void Con_FillRow(u32, u32, u8); - -void Video_Configure(GXRModeObj *); -void Video_SetMode(void); -void Video_Clear(s32); - -#ifdef __cplusplus -} -#endif - -#endif