diff --git a/Languages/czech.lang b/Languages/czech.lang index bfecd5d3..fb95d9ee 100644 --- a/Languages/czech.lang +++ b/Languages/czech.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-27 21:34+0100\n" +"POT-Creation-Date: 2010-12-29 11:19+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: David Jelinek (djelinek@hotmail.com) \n" "Language-Team: r823 - last version on http://djelinek.sweb.cz/_USBLoderGX/czech.lang \n" @@ -85,10 +85,10 @@ msgstr ">> Nacítám WAD data...Ok! " msgid "AUTO" msgstr "" -msgid "All images downloaded successfully." +msgid "All Partitions" msgstr "" -msgid "All partitions" +msgid "All images downloaded successfully." msgstr "" msgid "All the features of USB Loader GX are unlocked." @@ -525,9 +525,6 @@ msgstr "Nastavení hlasitosti hry" msgid "Game is already installed:" msgstr "Hra je již nainstalována:" -msgid "Game partition" -msgstr "" - msgid "Games" msgstr "Hry" @@ -783,6 +780,9 @@ msgstr "Oficiální místo:" msgid "Offset" msgstr "" +msgid "Only Game Partition" +msgstr "" + msgid "Parental Control" msgstr "Rodicovský zámek" diff --git a/Languages/danish.lang b/Languages/danish.lang index e9d86d8a..87b74d33 100644 --- a/Languages/danish.lang +++ b/Languages/danish.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-27 21:34+0100\n" +"POT-Creation-Date: 2010-12-29 11:19+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: dorf[dk]\n" "Language-Team: dorf[dk]\n" @@ -85,11 +85,11 @@ msgstr ">> Læser WAD-data...Ok!" msgid "AUTO" msgstr "" -msgid "All images downloaded successfully." +msgid "All Partitions" msgstr "" -msgid "All partitions" -msgstr "Alle partitioner" +msgid "All images downloaded successfully." +msgstr "" msgid "All the features of USB Loader GX are unlocked." msgstr "Alle USB Loader GX's funktioner er låst op." @@ -525,9 +525,6 @@ msgstr "Spillyd lydstyrke" msgid "Game is already installed:" msgstr "Dette spil er allerede installeret:" -msgid "Game partition" -msgstr "Spilpartition" - msgid "Games" msgstr "Spil" @@ -783,6 +780,9 @@ msgstr "Officiel side:" msgid "Offset" msgstr "" +msgid "Only Game Partition" +msgstr "" + msgid "Parental Control" msgstr "Børnelås" @@ -1200,6 +1200,12 @@ msgstr "af" msgid "seconds left" msgstr "sekunder tilbage" +#~ msgid "All partitions" +#~ msgstr "Alle partitioner" + +#~ msgid "Game partition" +#~ msgstr "Spilpartition" + #~ msgid "Install 1:1 Copy" #~ msgstr "Installér 1:1-kopi" diff --git a/Languages/dutch.lang b/Languages/dutch.lang index 1d8ef56c..6ed24b3b 100644 --- a/Languages/dutch.lang +++ b/Languages/dutch.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-27 21:34+0100\n" +"POT-Creation-Date: 2010-12-29 11:19+0100\n" "PO-Revision-Date: 2010-04-12 07:37+0100\n" "Last-Translator: glowy\n" "Language-Team: tj_cool, glowy\n" @@ -85,11 +85,11 @@ msgstr ">> WAD data lezen...Ok!" msgid "AUTO" msgstr "" -msgid "All images downloaded successfully." +msgid "All Partitions" msgstr "" -msgid "All partitions" -msgstr "Alle partities" +msgid "All images downloaded successfully." +msgstr "" msgid "All the features of USB Loader GX are unlocked." msgstr "Alle functies van USB Loader GX zijn vrijgegeven." @@ -525,9 +525,6 @@ msgstr "Spel geluid volume" msgid "Game is already installed:" msgstr "Spel is al geïnstalleerd:" -msgid "Game partition" -msgstr "Spel partitie" - msgid "Games" msgstr "Spellen" @@ -783,6 +780,9 @@ msgstr "Officiële site:" msgid "Offset" msgstr "" +msgid "Only Game Partition" +msgstr "" + msgid "Parental Control" msgstr "Ouderlijk toezicht" @@ -1200,6 +1200,12 @@ msgstr "van" msgid "seconds left" msgstr "seconden over" +#~ msgid "All partitions" +#~ msgstr "Alle partities" + +#~ msgid "Game partition" +#~ msgstr "Spel partitie" + #~ msgid "Install 1:1 Copy" #~ msgstr "Installeer 1:1 kopie" diff --git a/Languages/english.lang b/Languages/english.lang index 6039a91f..7e5d0a7a 100644 --- a/Languages/english.lang +++ b/Languages/english.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-27 21:34+0100\n" +"POT-Creation-Date: 2010-12-29 11:19+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -85,10 +85,10 @@ msgstr "" msgid "AUTO" msgstr "" -msgid "All images downloaded successfully." +msgid "All Partitions" msgstr "" -msgid "All partitions" +msgid "All images downloaded successfully." msgstr "" msgid "All the features of USB Loader GX are unlocked." @@ -525,9 +525,6 @@ msgstr "" msgid "Game is already installed:" msgstr "" -msgid "Game partition" -msgstr "" - msgid "Games" msgstr "" @@ -783,6 +780,9 @@ msgstr "" msgid "Offset" msgstr "" +msgid "Only Game Partition" +msgstr "" + msgid "Parental Control" msgstr "" diff --git a/Languages/finnish.lang b/Languages/finnish.lang index 17e08df2..f89ce4c0 100644 --- a/Languages/finnish.lang +++ b/Languages/finnish.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-27 21:34+0100\n" +"POT-Creation-Date: 2010-12-29 11:19+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: c64rmx\n" "Language-Team: \n" @@ -85,10 +85,10 @@ msgstr ">> Luetaan WAD:ia...Ok!" msgid "AUTO" msgstr "" -msgid "All images downloaded successfully." +msgid "All Partitions" msgstr "" -msgid "All partitions" +msgid "All images downloaded successfully." msgstr "" msgid "All the features of USB Loader GX are unlocked." @@ -525,9 +525,6 @@ msgstr "" msgid "Game is already installed:" msgstr "Peli on jo asennettu:" -msgid "Game partition" -msgstr "" - msgid "Games" msgstr "Pelejä" @@ -783,6 +780,9 @@ msgstr "Virallinen sivusto:" msgid "Offset" msgstr "" +msgid "Only Game Partition" +msgstr "" + msgid "Parental Control" msgstr "Valvonta" diff --git a/Languages/french.lang b/Languages/french.lang index 312027df..45406991 100644 --- a/Languages/french.lang +++ b/Languages/french.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-27 21:34+0100\n" +"POT-Creation-Date: 2010-12-29 11:19+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: Kin8\n" "Language-Team: Badablek, Amour, ikya & Kin8\n" @@ -85,11 +85,11 @@ msgstr ">> Lecture données WAD...OK!" msgid "AUTO" msgstr "" -msgid "All images downloaded successfully." +msgid "All Partitions" msgstr "" -msgid "All partitions" -msgstr "Toutes partitions" +msgid "All images downloaded successfully." +msgstr "" msgid "All the features of USB Loader GX are unlocked." msgstr "Toutes les fonctionnalités sont déverrouillées." @@ -525,9 +525,6 @@ msgstr "Volume Son des Jeux" msgid "Game is already installed:" msgstr "Le jeu est déjà installé:" -msgid "Game partition" -msgstr "Partition Jeu" - msgid "Games" msgstr "Jeux" @@ -783,6 +780,9 @@ msgstr "Site Officiel:" msgid "Offset" msgstr "" +msgid "Only Game Partition" +msgstr "" + msgid "Parental Control" msgstr "Contrôle Parental" @@ -1200,6 +1200,12 @@ msgstr "sur" msgid "seconds left" msgstr "secondes restantes" +#~ msgid "All partitions" +#~ msgstr "Toutes partitions" + +#~ msgid "Game partition" +#~ msgstr "Partition Jeu" + #~ msgid "Install 1:1 Copy" #~ msgstr "Installer Copie 1:1" diff --git a/Languages/german.lang b/Languages/german.lang index 7efce13f..5f645bc1 100644 --- a/Languages/german.lang +++ b/Languages/german.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-27 21:34+0100\n" +"POT-Creation-Date: 2010-12-29 11:19+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: ZEN.13\n" "Language-Team: Snoozer, wishmasterf, Bertilax, ZEN.13\n" @@ -85,11 +85,11 @@ msgstr ">> Lese WAD Daten...OK!" msgid "AUTO" msgstr "" -msgid "All images downloaded successfully." +msgid "All Partitions" msgstr "" -msgid "All partitions" -msgstr "Alle Partitionen" +msgid "All images downloaded successfully." +msgstr "" msgid "All the features of USB Loader GX are unlocked." msgstr "Alle Funktionen des USB Loader GX sind jetzt freigeschaltet." @@ -525,9 +525,6 @@ msgstr "Banner Lautstärke" msgid "Game is already installed:" msgstr "Spiel ist bereits installiert:" -msgid "Game partition" -msgstr "Spielpartition" - msgid "Games" msgstr "Spiele" @@ -783,6 +780,9 @@ msgstr "Offizielle Seite:" msgid "Offset" msgstr "" +msgid "Only Game Partition" +msgstr "" + msgid "Parental Control" msgstr "Altersbeschränkung" @@ -1200,6 +1200,12 @@ msgstr "von" msgid "seconds left" msgstr "Sekunden verbleiben" +#~ msgid "All partitions" +#~ msgstr "Alle Partitionen" + +#~ msgid "Game partition" +#~ msgstr "Spielpartition" + #~ msgid "Install 1:1 Copy" #~ msgstr "1:1 Kopie installieren" diff --git a/Languages/hungarian.lang b/Languages/hungarian.lang index 9ad0566c..96c4f9d6 100644 --- a/Languages/hungarian.lang +++ b/Languages/hungarian.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-27 21:34+0100\n" +"POT-Creation-Date: 2010-12-29 11:19+0100\n" "PO-Revision-Date: 2009-12-29 11:05+0100\n" "Last-Translator: Springdale\n" "Language-Team: Tusk, Springdale\n" @@ -85,11 +85,11 @@ msgstr ">> WAD adatok olvasása...Ok!" msgid "AUTO" msgstr "" -msgid "All images downloaded successfully." +msgid "All Partitions" msgstr "" -msgid "All partitions" -msgstr "Minden partíció" +msgid "All images downloaded successfully." +msgstr "" msgid "All the features of USB Loader GX are unlocked." msgstr "Az USB Loader GX minden funkciója elérhetõ." @@ -525,9 +525,6 @@ msgstr "Játék Banner hangerő" msgid "Game is already installed:" msgstr "A játék már fel van telepítve:" -msgid "Game partition" -msgstr "Játék partíció" - msgid "Games" msgstr "Játékok" @@ -783,6 +780,9 @@ msgstr "Hivatalos oldal:" msgid "Offset" msgstr "" +msgid "Only Game Partition" +msgstr "" + msgid "Parental Control" msgstr "Szülõi Felügyelet" @@ -1200,6 +1200,12 @@ msgstr "./" msgid "seconds left" msgstr "hátralévõ másodperc" +#~ msgid "All partitions" +#~ msgstr "Minden partíció" + +#~ msgid "Game partition" +#~ msgstr "Játék partíció" + #~ msgid "Install 1:1 Copy" #~ msgstr "1:1 másolat telepítése" diff --git a/Languages/italian.lang b/Languages/italian.lang index 7276b1f0..d9779f2d 100644 --- a/Languages/italian.lang +++ b/Languages/italian.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-27 21:34+0100\n" +"POT-Creation-Date: 2010-12-29 11:19+0100\n" "PO-Revision-Date: 2010-02-21 08:00+0200\n" "Last-Translator: Cambo \n" "Language-Team: FoxeJoe, Cambo\n" @@ -85,11 +85,11 @@ msgstr ">> Lettura dati WAD...OK!" msgid "AUTO" msgstr "Automatico" -msgid "All images downloaded successfully." +msgid "All Partitions" msgstr "" -msgid "All partitions" -msgstr "Tutte le partizioni" +msgid "All images downloaded successfully." +msgstr "" msgid "All the features of USB Loader GX are unlocked." msgstr "Tutte le funzioni di USB Loader GX sono sbloccate." @@ -525,9 +525,6 @@ msgstr "Volume Suono Giochi" msgid "Game is already installed:" msgstr "Gioco già installato:" -msgid "Game partition" -msgstr "Partizione gioco" - msgid "Games" msgstr "Giochi" @@ -783,6 +780,9 @@ msgstr "Sito Ufficiale:" msgid "Offset" msgstr "" +msgid "Only Game Partition" +msgstr "" + msgid "Parental Control" msgstr "Controllo Genitori" @@ -1200,6 +1200,12 @@ msgstr "di" msgid "seconds left" msgstr "secondi mancanti" +#~ msgid "All partitions" +#~ msgstr "Tutte le partizioni" + +#~ msgid "Game partition" +#~ msgstr "Partizione gioco" + #~ msgid "Install 1:1 Copy" #~ msgstr "Installa copia 1:1" diff --git a/Languages/japanese.lang b/Languages/japanese.lang index 4447e954..3acb35df 100644 --- a/Languages/japanese.lang +++ b/Languages/japanese.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-27 21:34+0100\n" +"POT-Creation-Date: 2010-12-29 11:19+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: hosigumayuugi\n" "Language-Team: hosigumayuugi\n" @@ -85,11 +85,11 @@ msgstr ">> WADﾃﾞｰﾀの読み込み...成功!" msgid "AUTO" msgstr "自動" -msgid "All images downloaded successfully." +msgid "All Partitions" msgstr "" -msgid "All partitions" -msgstr "全領域" +msgid "All images downloaded successfully." +msgstr "" msgid "All the features of USB Loader GX are unlocked." msgstr "GXの使用者制限が解除されました" @@ -525,9 +525,6 @@ msgstr "サウンドの音量" msgid "Game is already installed:" msgstr "このｹﾞｰﾑは既にｲﾝｽﾄｰﾙされています:" -msgid "Game partition" -msgstr "ゲーム領域のみ" - msgid "Games" msgstr "総ゲーム数" @@ -783,6 +780,9 @@ msgstr "公式サイト:" msgid "Offset" msgstr "" +msgid "Only Game Partition" +msgstr "" + msgid "Parental Control" msgstr "ﾍﾟｱﾚﾝﾀﾙｺﾝﾄﾛｰﾙ" @@ -1200,6 +1200,12 @@ msgstr "中" msgid "seconds left" msgstr "秒で完了" +#~ msgid "All partitions" +#~ msgstr "全領域" + +#~ msgid "Game partition" +#~ msgstr "ゲーム領域のみ" + #~ msgid "Install 1:1 Copy" #~ msgstr "フルコピー" diff --git a/Languages/korean.lang b/Languages/korean.lang index 2dd3ccc2..64598e8b 100644 --- a/Languages/korean.lang +++ b/Languages/korean.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-27 21:34+0100\n" +"POT-Creation-Date: 2010-12-29 11:19+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: nextos@korea.com\n" "Language-Team: \n" @@ -85,10 +85,10 @@ msgstr ">> WAD 데이터 읽기...성공!" msgid "AUTO" msgstr "자동" -msgid "All images downloaded successfully." +msgid "All Partitions" msgstr "" -msgid "All partitions" +msgid "All images downloaded successfully." msgstr "" msgid "All the features of USB Loader GX are unlocked." @@ -525,9 +525,6 @@ msgstr "" msgid "Game is already installed:" msgstr "게임이 이미 설치되어 있습니다." -msgid "Game partition" -msgstr "" - msgid "Games" msgstr "게임" @@ -783,6 +780,9 @@ msgstr "공식 사이트:" msgid "Offset" msgstr "" +msgid "Only Game Partition" +msgstr "" + msgid "Parental Control" msgstr "자녀보호기능" diff --git a/Languages/norwegian.lang b/Languages/norwegian.lang index 8b6c4f23..6134b076 100644 --- a/Languages/norwegian.lang +++ b/Languages/norwegian.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-27 21:34+0100\n" +"POT-Creation-Date: 2010-12-29 11:19+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: raschi\n" "Language-Team: raschi\n" @@ -85,10 +85,10 @@ msgstr ">> Leser WAD data...OK!" msgid "AUTO" msgstr "" -msgid "All images downloaded successfully." +msgid "All Partitions" msgstr "" -msgid "All partitions" +msgid "All images downloaded successfully." msgstr "" msgid "All the features of USB Loader GX are unlocked." @@ -525,9 +525,6 @@ msgstr "" msgid "Game is already installed:" msgstr "Spillet er allerede installert:" -msgid "Game partition" -msgstr "" - msgid "Games" msgstr "Spill" @@ -783,6 +780,9 @@ msgstr "Offisiell nettside:" msgid "Offset" msgstr "" +msgid "Only Game Partition" +msgstr "" + msgid "Parental Control" msgstr "Foreldrekontroll" diff --git a/Languages/polish.lang b/Languages/polish.lang index 2000b03b..c5bb577a 100644 --- a/Languages/polish.lang +++ b/Languages/polish.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-27 21:34+0100\n" +"POT-Creation-Date: 2010-12-29 11:19+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: ziom666 (zadania_prog@vp.pl)\n" "Language-Team: \n" @@ -85,11 +85,11 @@ msgstr ">> Odczyt danych WAD...Ok!" msgid "AUTO" msgstr "automatycznie" -msgid "All images downloaded successfully." +msgid "All Partitions" msgstr "" -msgid "All partitions" -msgstr "Wszystkie partycje" +msgid "All images downloaded successfully." +msgstr "" msgid "All the features of USB Loader GX are unlocked." msgstr "USB Loader GX odblokowany" @@ -525,9 +525,6 @@ msgstr "Gloscnosc dzwieku gry" msgid "Game is already installed:" msgstr "Gra jest juz zainstalowana:" -msgid "Game partition" -msgstr "Partycje z grami" - msgid "Games" msgstr "Liczba gier" @@ -783,6 +780,9 @@ msgstr "Strona oficjalna:" msgid "Offset" msgstr "" +msgid "Only Game Partition" +msgstr "" + msgid "Parental Control" msgstr "Kontrola rodzicielska" @@ -1200,6 +1200,12 @@ msgstr "z" msgid "seconds left" msgstr "sekund pozostalo" +#~ msgid "All partitions" +#~ msgstr "Wszystkie partycje" + +#~ msgid "Game partition" +#~ msgstr "Partycje z grami" + #~ msgid "Install 1:1 Copy" #~ msgstr "Zainstaluj kopie 1:1" diff --git a/Languages/portuguese_br.lang b/Languages/portuguese_br.lang index c586159a..f826b52c 100644 --- a/Languages/portuguese_br.lang +++ b/Languages/portuguese_br.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-27 21:34+0100\n" +"POT-Creation-Date: 2010-12-29 11:19+0100\n" "PO-Revision-Date: 2009-10-23 18:52+0200\n" "Last-Translator: aniemotion\n" "Language-Team: boto12, aniemotion\n" @@ -85,11 +85,11 @@ msgstr ">> Lendo arquivo WAD... Ok!" msgid "AUTO" msgstr "" -msgid "All images downloaded successfully." +msgid "All Partitions" msgstr "" -msgid "All partitions" -msgstr "Todas as Partições" +msgid "All images downloaded successfully." +msgstr "" msgid "All the features of USB Loader GX are unlocked." msgstr "As configurações estão desbloqueadas." @@ -525,9 +525,6 @@ msgstr "Volume dos Sons dos Jogos" msgid "Game is already installed:" msgstr "Este jogo já está instalado:" -msgid "Game partition" -msgstr "Partição de Game" - msgid "Games" msgstr "Jogos" @@ -783,6 +780,9 @@ msgstr "Site Oficial:" msgid "Offset" msgstr "" +msgid "Only Game Partition" +msgstr "" + msgid "Parental Control" msgstr "Controle de Pais" @@ -1200,6 +1200,12 @@ msgstr "de" msgid "seconds left" msgstr "segundos restantes" +#~ msgid "All partitions" +#~ msgstr "Todas as Partições" + +#~ msgid "Game partition" +#~ msgstr "Partição de Game" + #~ msgid "Install 1:1 Copy" #~ msgstr "Instalar 1:1 Copy" diff --git a/Languages/portuguese_pt.lang b/Languages/portuguese_pt.lang index 8ce9fd98..3e6dfa59 100644 --- a/Languages/portuguese_pt.lang +++ b/Languages/portuguese_pt.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-27 21:34+0100\n" +"POT-Creation-Date: 2010-12-29 11:19+0100\n" "PO-Revision-Date: 2010-03-22 10:55-0000\n" "Last-Translator: Sky8000\n" "Language-Team: Sky8000 \n" @@ -85,11 +85,11 @@ msgstr ">> Lendo ficheiro WAD... Ok!" msgid "AUTO" msgstr "" -msgid "All images downloaded successfully." +msgid "All Partitions" msgstr "" -msgid "All partitions" -msgstr "Todas as partições" +msgid "All images downloaded successfully." +msgstr "" msgid "All the features of USB Loader GX are unlocked." msgstr "As configurações estão desbloqueadas." @@ -525,9 +525,6 @@ msgstr "Volume de Som do Jogo" msgid "Game is already installed:" msgstr "O jogo já está instalado:" -msgid "Game partition" -msgstr "Partição de Jogos" - msgid "Games" msgstr "Jogos" @@ -783,6 +780,9 @@ msgstr "Site Oficial:" msgid "Offset" msgstr "" +msgid "Only Game Partition" +msgstr "" + msgid "Parental Control" msgstr "Controlo Parental" @@ -1200,6 +1200,12 @@ msgstr "de" msgid "seconds left" msgstr "segundos restantes" +#~ msgid "All partitions" +#~ msgstr "Todas as partições" + +#~ msgid "Game partition" +#~ msgstr "Partição de Jogos" + #~ msgid "Install 1:1 Copy" #~ msgstr "Instalar Cópia 1:1" diff --git a/Languages/russian.lang b/Languages/russian.lang index a51061f4..43136fba 100644 --- a/Languages/russian.lang +++ b/Languages/russian.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-27 21:34+0100\n" +"POT-Creation-Date: 2010-12-29 11:19+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: nikolai_ca\n" "Language-Team: Kir, alendit, nikolai_ca\n" @@ -85,11 +85,11 @@ msgstr ">> Чтение данных WAD...Успешно!" msgid "AUTO" msgstr "АВТО" -msgid "All images downloaded successfully." +msgid "All Partitions" msgstr "" -msgid "All partitions" -msgstr "Все разделы" +msgid "All images downloaded successfully." +msgstr "" msgid "All the features of USB Loader GX are unlocked." msgstr "Все функции USB Loader GX разблокированы." @@ -525,9 +525,6 @@ msgstr "Громкость звука в игре" msgid "Game is already installed:" msgstr "Игра уже установлена:" -msgid "Game partition" -msgstr "Раздел игры" - msgid "Games" msgstr "Игры" @@ -783,6 +780,9 @@ msgstr "Оф. сайт:" msgid "Offset" msgstr "" +msgid "Only Game Partition" +msgstr "" + msgid "Parental Control" msgstr "Родительский Контроль" @@ -1200,6 +1200,12 @@ msgstr "из" msgid "seconds left" msgstr "секунд осталось" +#~ msgid "All partitions" +#~ msgstr "Все разделы" + +#~ msgid "Game partition" +#~ msgstr "Раздел игры" + #~ msgid "Install 1:1 Copy" #~ msgstr "Установка копии 1:1" diff --git a/Languages/schinese.lang b/Languages/schinese.lang index 6080d0d2..5ce05838 100644 --- a/Languages/schinese.lang +++ b/Languages/schinese.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-27 21:34+0100\n" +"POT-Creation-Date: 2010-12-29 11:19+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: knife.hu kavid\n" "Language-Team: kavid\n" @@ -85,10 +85,10 @@ msgstr ">> 读取 WAD 数据... 成功!" msgid "AUTO" msgstr "自动" -msgid "All images downloaded successfully." +msgid "All Partitions" msgstr "" -msgid "All partitions" +msgid "All images downloaded successfully." msgstr "" msgid "All the features of USB Loader GX are unlocked." @@ -525,9 +525,6 @@ msgstr "" msgid "Game is already installed:" msgstr "已安装的游戏:" -msgid "Game partition" -msgstr "" - msgid "Games" msgstr "游戏" @@ -783,6 +780,9 @@ msgstr "官方网址:" msgid "Offset" msgstr "" +msgid "Only Game Partition" +msgstr "" + msgid "Parental Control" msgstr "家长控制" diff --git a/Languages/spanish.lang b/Languages/spanish.lang index 600241a2..52cc531b 100644 --- a/Languages/spanish.lang +++ b/Languages/spanish.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-27 21:34+0100\n" +"POT-Creation-Date: 2010-12-29 11:19+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: SirPalax\n" "Language-Team: Penn, SirPalax\n" @@ -85,11 +85,11 @@ msgstr ">> Leyendo datos del WAD... ¡Correcto!" msgid "AUTO" msgstr "" -msgid "All images downloaded successfully." +msgid "All Partitions" msgstr "" -msgid "All partitions" -msgstr "Todas las particiones" +msgid "All images downloaded successfully." +msgstr "" msgid "All the features of USB Loader GX are unlocked." msgstr "Todas las características del USB Loader GX desbloqueadas." @@ -525,9 +525,6 @@ msgstr "Volumen sonido del Juego" msgid "Game is already installed:" msgstr "El juego ya estaba instalado:" -msgid "Game partition" -msgstr "Partición de Juegos" - msgid "Games" msgstr "Juegos" @@ -783,6 +780,9 @@ msgstr "Página Oficial:" msgid "Offset" msgstr "" +msgid "Only Game Partition" +msgstr "" + msgid "Parental Control" msgstr "Control Parental" @@ -1200,6 +1200,12 @@ msgstr "de" msgid "seconds left" msgstr "segundos restantes" +#~ msgid "All partitions" +#~ msgstr "Todas las particiones" + +#~ msgid "Game partition" +#~ msgstr "Partición de Juegos" + #~ msgid "Install 1:1 Copy" #~ msgstr "Instalar Copias 1:1" diff --git a/Languages/swedish.lang b/Languages/swedish.lang index abced01e..ed25970d 100644 --- a/Languages/swedish.lang +++ b/Languages/swedish.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-27 21:34+0100\n" +"POT-Creation-Date: 2010-12-29 11:19+0100\n" "PO-Revision-Date: 2010-01-19 17:39+0200\n" "Last-Translator: Katsurou\n" "Language-Team: Katsurou, pirateX\n" @@ -85,11 +85,11 @@ msgstr ">> Läser WAD data...Ok!" msgid "AUTO" msgstr "" -msgid "All images downloaded successfully." +msgid "All Partitions" msgstr "" -msgid "All partitions" -msgstr "Alla partitioner" +msgid "All images downloaded successfully." +msgstr "" msgid "All the features of USB Loader GX are unlocked." msgstr "Alla funktioner i USB Loader GX är upplåsta." @@ -525,9 +525,6 @@ msgstr "Spel ljuds volym" msgid "Game is already installed:" msgstr "Spelet är redan installerat:" -msgid "Game partition" -msgstr "Spel partition" - msgid "Games" msgstr "Spel" @@ -783,6 +780,9 @@ msgstr "Officiell sida:" msgid "Offset" msgstr "" +msgid "Only Game Partition" +msgstr "" + msgid "Parental Control" msgstr "Föräldrakontroll" @@ -1200,6 +1200,12 @@ msgstr "av" msgid "seconds left" msgstr "sekunder kvar" +#~ msgid "All partitions" +#~ msgstr "Alla partitioner" + +#~ msgid "Game partition" +#~ msgstr "Spel partition" + #~ msgid "Install 1:1 Copy" #~ msgstr "Installera 1:1 Kopia" diff --git a/Languages/tchinese.lang b/Languages/tchinese.lang index a468731e..ca47ab74 100644 --- a/Languages/tchinese.lang +++ b/Languages/tchinese.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-27 21:34+0100\n" +"POT-Creation-Date: 2010-12-29 11:19+0100\n" "PO-Revision-Date: 2010-02-15 21:00+0800\n" "Last-Translator: Jane.H\n" "Language-Team: kyogc, Miller, Mika Li, Jane.H\n" @@ -85,11 +85,11 @@ msgstr ">> 讀取 WAD 數據... 成功!" msgid "AUTO" msgstr "自動" -msgid "All images downloaded successfully." +msgid "All Partitions" msgstr "" -msgid "All partitions" -msgstr "所有磁區" +msgid "All images downloaded successfully." +msgstr "" msgid "All the features of USB Loader GX are unlocked." msgstr "USB Loader GX 功能已解鎖." @@ -525,9 +525,6 @@ msgstr "遊戲聲音音量" msgid "Game is already installed:" msgstr "已安裝過遊戲:" -msgid "Game partition" -msgstr "遊戲磁區" - msgid "Games" msgstr "遊戲數量" @@ -783,6 +780,9 @@ msgstr "官方網址:" msgid "Offset" msgstr "" +msgid "Only Game Partition" +msgstr "" + msgid "Parental Control" msgstr "親子控制" @@ -1200,6 +1200,12 @@ msgstr "的" msgid "seconds left" msgstr "剩餘秒數" +#~ msgid "All partitions" +#~ msgstr "所有磁區" + +#~ msgid "Game partition" +#~ msgstr "遊戲磁區" + #~ msgid "Install 1:1 Copy" #~ msgstr "安裝用 1:1 複製" diff --git a/Languages/thai.lang b/Languages/thai.lang index 3b07eade..06fa3db0 100644 --- a/Languages/thai.lang +++ b/Languages/thai.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-27 21:34+0100\n" +"POT-Creation-Date: 2010-12-29 11:19+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: Nitro_subzero \n" "Language-Team: Nitro_subzero\n" @@ -85,10 +85,10 @@ msgstr ">> กำลังอ่านข้อมูล WAD...สำเร็ msgid "AUTO" msgstr "อัตโนมัติ" -msgid "All images downloaded successfully." +msgid "All Partitions" msgstr "" -msgid "All partitions" +msgid "All images downloaded successfully." msgstr "" msgid "All the features of USB Loader GX are unlocked." @@ -525,9 +525,6 @@ msgstr "ระดับเสียงในเกมส์" msgid "Game is already installed:" msgstr "เกมส์นี้ถูกติดตั้งอยู่แล้ว:" -msgid "Game partition" -msgstr "" - msgid "Games" msgstr "เกมส์" @@ -783,6 +780,9 @@ msgstr "เวบไซต์อย่างเป็นทางการ:" msgid "Offset" msgstr "" +msgid "Only Game Partition" +msgstr "" + msgid "Parental Control" msgstr "กำหนดอายุ" diff --git a/Languages/turkish.lang b/Languages/turkish.lang index 75d45ee5..903274b6 100644 --- a/Languages/turkish.lang +++ b/Languages/turkish.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-27 21:34+0100\n" +"POT-Creation-Date: 2010-12-29 11:19+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: omercigingelini\n" "Language-Team: omercigingelini\n" @@ -85,10 +85,10 @@ msgstr ">> WAD Bilgisi okunuyor..OK!" msgid "AUTO" msgstr "OTOMATIK" -msgid "All images downloaded successfully." +msgid "All Partitions" msgstr "" -msgid "All partitions" +msgid "All images downloaded successfully." msgstr "" msgid "All the features of USB Loader GX are unlocked." @@ -525,9 +525,6 @@ msgstr "Oyun Ses Düzeyi" msgid "Game is already installed:" msgstr "Oyun zaten kurulu:" -msgid "Game partition" -msgstr "" - msgid "Games" msgstr "Oyunlar" @@ -783,6 +780,9 @@ msgstr "Resmi Site:" msgid "Offset" msgstr "" +msgid "Only Game Partition" +msgstr "" + msgid "Parental Control" msgstr "Ebeveyn kontrolü" diff --git a/source/libs/libext2fs/libcustomext2fs.a b/source/libs/libext2fs/libcustomext2fs.a index c0af64b5..14ae3518 100644 Binary files a/source/libs/libext2fs/libcustomext2fs.a and b/source/libs/libext2fs/libcustomext2fs.a differ diff --git a/source/libs/libfat/libcustomfat.a b/source/libs/libfat/libcustomfat.a index fd5ac19b..88a27524 100644 Binary files a/source/libs/libfat/libcustomfat.a and b/source/libs/libfat/libcustomfat.a differ diff --git a/source/libs/libntfs/libcustomntfs.a b/source/libs/libntfs/libcustomntfs.a index a141dce6..30d86a9b 100644 Binary files a/source/libs/libntfs/libcustomntfs.a and b/source/libs/libntfs/libcustomntfs.a differ diff --git a/source/patches/patchcode.c b/source/patches/patchcode.c index 9b442a80..adb599f9 100644 --- a/source/patches/patchcode.c +++ b/source/patches/patchcode.c @@ -324,53 +324,49 @@ void langpatcher(void *addr, u32 len, u8 languageChoice) u8 ocarinaLangPatchByte = 1; switch (languageChoice) { - case JAPANESE: - ocarinaLangPatchByte = 0x00; - break; - case ENGLISH: - ocarinaLangPatchByte = 0x01; - break; - case GERMAN: - ocarinaLangPatchByte = 0x02; - break; - case FRENCH: - ocarinaLangPatchByte = 0x03; - break; - case SPANISH: - ocarinaLangPatchByte = 0x04; - break; - case ITALIAN: - ocarinaLangPatchByte = 0x05; - break; - case DUTCH: - ocarinaLangPatchByte = 0x06; - break; - case S_CHINESE: - ocarinaLangPatchByte = 0x07; - break; - case T_CHINESE: - ocarinaLangPatchByte = 0x08; - break; - case KOREAN: - ocarinaLangPatchByte = 0x09; - break; - case CONSOLE_DEFAULT: - default: - return; - break; + case JAPANESE: + ocarinaLangPatchByte = 0x00; + break; + case ENGLISH: + ocarinaLangPatchByte = 0x01; + break; + case GERMAN: + ocarinaLangPatchByte = 0x02; + break; + case FRENCH: + ocarinaLangPatchByte = 0x03; + break; + case SPANISH: + ocarinaLangPatchByte = 0x04; + break; + case ITALIAN: + ocarinaLangPatchByte = 0x05; + break; + case DUTCH: + ocarinaLangPatchByte = 0x06; + break; + case S_CHINESE: + ocarinaLangPatchByte = 0x07; + break; + case T_CHINESE: + ocarinaLangPatchByte = 0x08; + break; + case KOREAN: + ocarinaLangPatchByte = 0x09; + break; + default: + return; } - - - void *addr_start = addr; - void *addr_end = addr + len; + u8 * addr_start = addr; + u8 * addr_end = addr + len; while (addr_start < addr_end) { if (memcmp(addr_start, langpatch, sizeof(langpatch)) == 0) { - langvipatch((u32) addr_start, len, ocarinaLangPatchByte); + langvipatch((u32) addr_start, len, ocarinaLangPatchByte); } addr_start += 4; } diff --git a/source/prompts/DiscBrowser.cpp b/source/prompts/DiscBrowser.cpp index 3cf7f7c3..17cb35d9 100644 --- a/source/prompts/DiscBrowser.cpp +++ b/source/prompts/DiscBrowser.cpp @@ -242,15 +242,21 @@ int autoSelectDol(const char *id, bool force) if (strcmp(id, "RSXP69") == 0) return 377;//previous value was 337 if (strcmp(id, "RSXE69") == 0) return 377;//previous value was 337 - //Wii Sports Resort, needs alt dol one time only, to show the Motion Plus video - //if (strcmp(id,"RZTP01") == 0 && CheckForSave(id4)==0) return 952;//from isostar - //if (strcmp(id,"RZTE01") == 0 && CheckForSave(id4)==0) return 674;//from starstremr - //as well as Grand Slam Tennis, Tiger Woods 10, Virtual Tennis 2009 + //Madden NFL 07 + if (strcmp(id, "RMDE69") == 0) return 39; //from TwEbErIs + + //Madden NFL 08 + if (strcmp(id, "RNFE69") == 0) return 1079; //from TwEbErIs + + //Super Swing Golf + if (strcmp(id, "RPYE9B") == 0) return 10617; //from TwEbErIs + + //NBA Live 08 + if (strcmp(id, "RNBE69") == 0) return 936; //from TwEbErIs ///// games that can't be forced (alt dol is not always needed) if (!force) { - //Grand Slam Tennis if (strcmp(id, "R5TP69") == 0) return 1493;//from isostar if (strcmp(id, "R5TE69") == 0) return 1493;//starstremr diff --git a/source/settings/CSettings.cpp b/source/settings/CSettings.cpp index ec1b86b0..b322f4bb 100644 --- a/source/settings/CSettings.cpp +++ b/source/settings/CSettings.cpp @@ -72,7 +72,7 @@ void CSettings::SetDefault() strcpy(returnTo, ""); godmode = 1; - videomode = VIDEO_MODE_DISCDEFAULT; + videomode = VIDEO_MODE_SYSDEFAULT; videopatch = OFF; language = CONSOLE_DEFAULT; ocarina = OFF; @@ -545,32 +545,41 @@ bool CSettings::SetSetting(char *name, char *value) bool CSettings::FindConfig() { bool found = false; + char CheckDevice[10]; char CheckPath[300]; - strcpy(BootDevice, "SD:"); + strcpy(CheckDevice, "SD:"); for (int i = 0; i < 2; ++i) { - if (i == 1) strcpy(BootDevice, "USB:"); + if (i == 1) strcpy(CheckDevice, "USB:"); - snprintf(ConfigPath, sizeof(ConfigPath), "%s/apps/usbloader_gx/", BootDevice); - snprintf(CheckPath, sizeof(CheckPath), "%sGXGlobal.cfg", ConfigPath); - if ((found = CheckFile(CheckPath))) break; - - snprintf(ConfigPath, sizeof(ConfigPath), "%s/config/", BootDevice); - snprintf(CheckPath, sizeof(CheckPath), "%sGXGlobal.cfg", ConfigPath); - if ((found = CheckFile(CheckPath))) break; + if(!found) + { + strcpy(BootDevice, CheckDevice); + snprintf(ConfigPath, sizeof(ConfigPath), "%s/apps/usbloader_gx/", BootDevice); + snprintf(CheckPath, sizeof(CheckPath), "%sGXGlobal.cfg", ConfigPath); + found = CheckFile(CheckPath); + } + if(!found) + { + strcpy(BootDevice, CheckDevice); + snprintf(ConfigPath, sizeof(ConfigPath), "%s/config/", BootDevice); + snprintf(CheckPath, sizeof(CheckPath), "%sGXGlobal.cfg", ConfigPath); + found = CheckFile(CheckPath); + } } if (!found) { FILE * testFp = NULL; - strcpy(BootDevice, "SD:"); + strcpy(CheckDevice, "SD:"); //! No existing config so try to find a place where we can write it too for (int i = 0; i < 2; ++i) { - if (i == 1) strcpy(BootDevice, "USB:"); + if (i == 1) strcpy(CheckDevice, "USB:"); if (!found) { + strcpy(BootDevice, CheckDevice); snprintf(ConfigPath, sizeof(ConfigPath), "%s/apps/usbloader_gx/", BootDevice); snprintf(CheckPath, sizeof(CheckPath), "%sGXGlobal.cfg", ConfigPath); testFp = fopen(CheckPath, "wb"); @@ -579,6 +588,7 @@ bool CSettings::FindConfig() } if (!found) { + strcpy(BootDevice, CheckDevice); snprintf(ConfigPath, sizeof(ConfigPath), "%s/config/", BootDevice); CreateSubfolder(ConfigPath); snprintf(CheckPath, sizeof(CheckPath), "%sGXGlobal.cfg", ConfigPath); @@ -623,36 +633,6 @@ void CSettings::TrimLine(char *dest, char *src, int size) dest[len] = 0; } -//! Get the language code from CONF -static inline const char * GetLangCode(int langid) -{ - switch (langid) - { - case CONF_LANG_JAPANESE: - return "JA"; - case CONF_LANG_ENGLISH: - return "EN"; - case CONF_LANG_GERMAN: - return "DE"; - case CONF_LANG_FRENCH: - return "FR"; - case CONF_LANG_SPANISH: - return "ES"; - case CONF_LANG_ITALIAN: - return "IT"; - case CONF_LANG_DUTCH: - return "NL"; - case CONF_LANG_SIMP_CHINESE: - return "ZHCN"; - case CONF_LANG_TRAD_CHINESE: - return "ZHTW"; - case CONF_LANG_KOREAN: - return "KO"; - default: - return "EN"; - } -} - //! Get language code from the selected language file //! eg. german.lang = DE and default to EN static inline const char * GetLangCode(const char * langpath) @@ -687,13 +667,13 @@ static inline const char * GetLangCode(const char * langpath) return "EN"; } -bool CSettings::LoadLanguage(const char *path, int language) +bool CSettings::LoadLanguage(const char *path, int lang) { bool ret = false; - if (language >= 0 || !path || strlen(path) == 0) + if (lang >= 0 || !path || strlen(path) == 0) { - if (language < 0) return false; + if (lang < 0) return false; char filepath[150]; char langpath[150]; @@ -708,55 +688,49 @@ bool CSettings::LoadLanguage(const char *path, int language) } } - if (language == APP_DEFAULT) + if (lang == CONSOLE_DEFAULT) { - strcpy(language_path, ""); - gettextCleanUp(); - return true; + return LoadLanguage(NULL, CONF_GetLanguage()); } - else if (language == CONSOLE_DEFAULT) - { - return LoadLanguage(NULL, CONF_GetLanguage() + 2); - } - else if (language == JAPANESE) + else if (lang == JAPANESE) { snprintf(filepath, sizeof(filepath), "%s/japanese.lang", langpath); } - else if (language == ENGLISH) + else if (lang == ENGLISH) { snprintf(filepath, sizeof(filepath), "%s/english.lang", langpath); } - else if (language == GERMAN) + else if (lang == GERMAN) { snprintf(filepath, sizeof(filepath), "%s/german.lang", langpath); } - else if (language == FRENCH) + else if (lang == FRENCH) { snprintf(filepath, sizeof(filepath), "%s/french.lang", langpath); } - else if (language == SPANISH) + else if (lang == SPANISH) { snprintf(filepath, sizeof(filepath), "%s/spanish.lang", langpath); } - else if (language == ITALIAN) + else if (lang == ITALIAN) { snprintf(filepath, sizeof(filepath), "%s/italian.lang", langpath); } - else if (language == DUTCH) + else if (lang == DUTCH) { snprintf(filepath, sizeof(filepath), "%s/dutch.lang", langpath); } - else if (language == S_CHINESE) + else if (lang == S_CHINESE) { snprintf(filepath, sizeof(filepath), "%s/schinese.lang", langpath); } - else if (language == T_CHINESE) + else if (lang == T_CHINESE) { snprintf(filepath, sizeof(filepath), "%s/tchinese.lang", langpath); } - else if (language == KOREAN) + else if (lang == KOREAN) { - snprintf(filepath, sizeof(filepath), "%s%s/korean.lang", BootDevice, langpath); + snprintf(filepath, sizeof(filepath), "%s/korean.lang", langpath); } ret = gettextLoadLanguage(filepath); @@ -768,7 +742,7 @@ bool CSettings::LoadLanguage(const char *path, int language) } else if (strlen(path) < 3) { - return LoadLanguage(NULL, CONF_GetLanguage() + 2); + return LoadLanguage(NULL, CONSOLE_DEFAULT); } else { diff --git a/source/settings/SettingsEnums.h b/source/settings/SettingsEnums.h index 0691f17a..1883e52a 100644 --- a/source/settings/SettingsEnums.h +++ b/source/settings/SettingsEnums.h @@ -5,9 +5,7 @@ enum { - APP_DEFAULT = 0, - CONSOLE_DEFAULT, - JAPANESE, + JAPANESE = 0, ENGLISH, GERMAN, FRENCH, @@ -17,17 +15,18 @@ enum S_CHINESE, T_CHINESE, KOREAN, - MAX_LANGUAGE + CONSOLE_DEFAULT, + MAX_LANGUAGE, }; enum { VIDEO_MODE_SYSDEFAULT = 0, VIDEO_MODE_DISCDEFAULT, - VIDEO_MODE_PATCH, VIDEO_MODE_PAL50, VIDEO_MODE_PAL60, VIDEO_MODE_NTSC, + VIDEO_MODE_PATCH, VIDEO_MODE_MAX }; diff --git a/source/settings/SettingsPrompts.cpp b/source/settings/SettingsPrompts.cpp index 13420c99..f8c375f7 100644 --- a/source/settings/SettingsPrompts.cpp +++ b/source/settings/SettingsPrompts.cpp @@ -234,7 +234,7 @@ int MenuLanguageSelect() choice = WindowPrompt( tr( "Loading standard language." ), 0, tr( "OK" ), tr( "Cancel" ) ); if ( choice == 1 ) { - Settings.LoadLanguage(NULL, APP_DEFAULT); + Settings.LoadLanguage(NULL, CONSOLE_DEFAULT); Settings.Save(); returnhere = 2; } @@ -311,7 +311,7 @@ int MenuLanguageSelect() if (!CheckFile(newLangPath)) { WindowPrompt(tr("File not found."), tr("Loading standard language."), tr("OK")); - Settings.LoadLanguage(NULL, APP_DEFAULT); + Settings.LoadLanguage(NULL, CONSOLE_DEFAULT); } else { diff --git a/source/settings/menus/GameLoadSM.cpp b/source/settings/menus/GameLoadSM.cpp index b14f348d..c7d582ee 100644 --- a/source/settings/menus/GameLoadSM.cpp +++ b/source/settings/menus/GameLoadSM.cpp @@ -48,18 +48,16 @@ static const char * OnOffText[MAX_ON_OFF] = static const char * VideoModeText[VIDEO_MODE_MAX] = { - trNOOP( "Disc Default" ), trNOOP( "System Default" ), - trNOOP( "AutoPatch" ), + trNOOP( "Disc Default" ), trNOOP( "Force PAL50" ), trNOOP( "Force PAL60" ), - trNOOP( "Force NTSC" ) + trNOOP( "Force NTSC" ), + trNOOP( "Region Patch" ), }; static const char * LanguageText[MAX_LANGUAGE] = { - trNOOP( "Disc Default" ), - trNOOP( "Console Default" ), trNOOP( "Japanese" ), trNOOP( "English" ), trNOOP( "German" ), @@ -69,7 +67,8 @@ static const char * LanguageText[MAX_LANGUAGE] = trNOOP( "Dutch" ), trNOOP( "SChinese" ), trNOOP( "TChinese" ), - trNOOP( "Korean" ) + trNOOP( "Korean" ), + trNOOP( "Console Default" ) }; static const char * InstallToText[INSTALL_TO_MAX] = @@ -183,9 +182,9 @@ void GameLoadSM::SetOptionValues() //! Settings: Install partitions if(Settings.InstallPartitions == ONLY_GAME_PARTITION) - Options->SetValue(Idx++, "%s", tr("Game partition")); + Options->SetValue(Idx++, "%s", tr("Only Game Partition")); else if(Settings.InstallPartitions == ALL_PARTITIONS) - Options->SetValue(Idx++, "%s", tr("All partitions")); + Options->SetValue(Idx++, "%s", tr("All Partitions")); else if(Settings.InstallPartitions == REMOVE_UPDATE_PARTITION) Options->SetValue(Idx++, "%s", tr("Remove update")); diff --git a/source/settings/menus/IndGameLoadSM.cpp b/source/settings/menus/IndGameLoadSM.cpp index 9a6848ca..f6f9b27b 100644 --- a/source/settings/menus/IndGameLoadSM.cpp +++ b/source/settings/menus/IndGameLoadSM.cpp @@ -39,18 +39,16 @@ static const char * OnOffText[MAX_ON_OFF] = static const char * VideoModeText[VIDEO_MODE_MAX] = { - trNOOP( "Disc Default" ), trNOOP( "System Default" ), - trNOOP( "AutoPatch" ), + trNOOP( "Disc Default" ), trNOOP( "Force PAL50" ), trNOOP( "Force PAL60" ), - trNOOP( "Force NTSC" ) + trNOOP( "Force NTSC" ), + trNOOP( "Region Patch" ), }; static const char * LanguageText[MAX_LANGUAGE] = { - trNOOP( "Disc Default" ), - trNOOP( "Console Default" ), trNOOP( "Japanese" ), trNOOP( "English" ), trNOOP( "German" ), @@ -60,7 +58,8 @@ static const char * LanguageText[MAX_LANGUAGE] = trNOOP( "Dutch" ), trNOOP( "SChinese" ), trNOOP( "TChinese" ), - trNOOP( "Korean" ) + trNOOP( "Korean" ), + trNOOP( "Console Default" ), }; static const char * Error002Text[3] = diff --git a/source/usbloader/GameList.cpp b/source/usbloader/GameList.cpp index ef654b49..637bf324 100644 --- a/source/usbloader/GameList.cpp +++ b/source/usbloader/GameList.cpp @@ -148,9 +148,9 @@ int GameList::FilterList(const wchar_t * gameFilter) GameCFG * GameConfig = GameSettings.GetGameCFG(header); - if (Settings.parentalcontrol && !Settings.godmode) + if (Settings.parentalcontrol != 4 && !Settings.godmode) { - if (GameConfig && GameConfig->parentalcontrol >= Settings.parentalcontrol) + if (GameConfig && GameConfig->parentalcontrol > Settings.parentalcontrol) continue; } diff --git a/source/usbloader/disc.c b/source/usbloader/disc.c index 4e930914..143d3eb3 100644 --- a/source/usbloader/disc.c +++ b/source/usbloader/disc.c @@ -86,58 +86,60 @@ void __Disc_SetVMode(u8 videoselected) switch (videoselected) { - case VIDEO_MODE_PAL50: + case VIDEO_MODE_PAL50: vmode = &TVPal528IntDf; vmode_reg = (vmode->viTVMode) >> 2; break; - case VIDEO_MODE_PAL60: + + case VIDEO_MODE_PAL60: vmode = (progressive) ? &TVNtsc480Prog : &TVEurgb60Hz480IntDf; vmode_reg = (vmode->viTVMode) >> 2; break; - case VIDEO_MODE_NTSC: + + case VIDEO_MODE_NTSC: vmode = (progressive) ? &TVNtsc480Prog : &TVNtsc480IntDf; vmode_reg = (vmode->viTVMode) >> 2; break; - case VIDEO_MODE_SYSDEFAULT: + + default: + case VIDEO_MODE_SYSDEFAULT: // vmode = VIDEO_GetPreferredMode(NULL); break; - case VIDEO_MODE_DISCDEFAULT: - default: - /* Select video mode */ - switch (diskid[3]) - { - /* PAL */ - case 'P': - case 'D': - case 'F': - case 'I': - case 'S': - case 'H': - case 'X': - case 'Y': - case 'Z': - if (tvmode != CONF_VIDEO_PAL) - { - vmode_reg = 5; - vmode = (progressive) ? &TVNtsc480Prog : &TVEurgb60Hz480IntDf; - } - break; + case VIDEO_MODE_DISCDEFAULT: + /* Select video mode */ + switch (diskid[3]) + { + /* PAL */ + case 'P': + case 'D': + case 'F': + case 'I': + case 'S': + case 'H': + case 'X': + case 'Y': + case 'Z': + if (tvmode != CONF_VIDEO_PAL) + { + vmode_reg = 5; + vmode = (progressive) ? &TVNtsc480Prog : &TVEurgb60Hz480IntDf; + } + break; - /* NTSC or unknown */ - case 'E': - case 'J': - case 'K': - case 'W': - if (tvmode != CONF_VIDEO_NTSC) - { - vmode_reg = 0; - vmode = (progressive) ? &TVNtsc480Prog : &TVNtsc480IntDf; - } - - break; - } - break; + /* NTSC or unknown */ + case 'E': + case 'J': + case 'K': + case 'W': + if (tvmode != CONF_VIDEO_NTSC) + { + vmode_reg = 0; + vmode = (progressive) ? &TVNtsc480Prog : &TVNtsc480IntDf; + } + break; + } + break; } /* Set video mode register */