From 6171ba5980bd527cd0f434e83d9b8440218a8c36 Mon Sep 17 00:00:00 2001
From: Cyan <cyan06@users.noreply.github.com>
Date: Tue, 15 Nov 2011 21:01:25 +0000
Subject: [PATCH] *Fixed ocarina not loading the gct file. *Added Zelda Skyward
 Sword Alternative dol offset (PAL and NTSC-U) *updated French, Japanese and
 Italian language.

---
 HBC/META.XML                             |  4 +--
 Languages/czech.lang                     |  4 +--
 Languages/danish.lang                    |  4 +--
 Languages/dutch.lang                     |  4 +--
 Languages/english.lang                   |  4 +--
 Languages/finnish.lang                   |  4 +--
 Languages/french.lang                    | 22 ++++++------
 Languages/german.lang                    |  4 +--
 Languages/hungarian.lang                 |  4 +--
 Languages/italian.lang                   | 44 ++++++++++++------------
 Languages/japanese.lang                  | 38 ++++++++++----------
 Languages/korean.lang                    |  4 +--
 Languages/norwegian.lang                 |  4 +--
 Languages/polish.lang                    |  4 +--
 Languages/portuguese_br.lang             |  4 +--
 Languages/portuguese_pt.lang             |  4 +--
 Languages/russian.lang                   |  4 +--
 Languages/schinese.lang                  |  4 +--
 Languages/spanish.lang                   |  4 +--
 Languages/swedish.lang                   |  4 +--
 Languages/tchinese.lang                  |  4 +--
 Languages/thai.lang                      |  4 +--
 Languages/turkish.lang                   |  4 +--
 source/patches/patchcode.c               |  4 +--
 source/patches/patchcode.h               |  2 +-
 source/usbloader/AlternateDOLOffsets.cpp | 14 ++++++++
 source/usbloader/GameBooter.cpp          |  2 +-
 27 files changed, 110 insertions(+), 96 deletions(-)

diff --git a/HBC/META.XML b/HBC/META.XML
index 5e3e8034..6b95057d 100644
--- a/HBC/META.XML
+++ b/HBC/META.XML
@@ -2,8 +2,8 @@
 	<app version="1">
 		<name> USB Loader GX</name>
 		<coder>USB Loader GX Team</coder>
-		<version>2.3 r1129</version>
-		<release_date>201111121818</release_date>
+		<version>2.3 r1130</version>
+		<release_date>201111152146</release_date>
 		<!--   // remove this line to enable arguments
 		<arguments>
 				<arg>--ios=250</arg>
diff --git a/Languages/czech.lang b/Languages/czech.lang
index da04dd31..627a9525 100644
--- a/Languages/czech.lang
+++ b/Languages/czech.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-12 18:58+0100\n"
+"POT-Creation-Date: 2011-11-15 21:46+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: David Jelinek (djelinek@hotmail.com) e->e,r->r,u->u, c->c \n"
 "Language-Team: r1056 - last version on http://djelinek.sweb.cz/_USBLoderGX/czech.lang \n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 msgid " could not be downloaded."
 msgstr " nelze stáhnout."
diff --git a/Languages/danish.lang b/Languages/danish.lang
index ea1c09be..44383b32 100644
--- a/Languages/danish.lang
+++ b/Languages/danish.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-12 18:58+0100\n"
+"POT-Creation-Date: 2011-11-15 21:46+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: Fox888[dk]\n"
 "Language-Team: [dk]\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 msgid " could not be downloaded."
 msgstr " kunne ikke downloades."
diff --git a/Languages/dutch.lang b/Languages/dutch.lang
index a697bb47..89c4be80 100644
--- a/Languages/dutch.lang
+++ b/Languages/dutch.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-12 18:58+0100\n"
+"POT-Creation-Date: 2011-11-15 21:46+0100\n"
 "PO-Revision-Date: 2011-06-30 14:22+0100\n"
 "Last-Translator: glowy\n"
 "Language-Team: tj_cool, glowy\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 msgid " could not be downloaded."
 msgstr " kon niet worden gedownload."
diff --git a/Languages/english.lang b/Languages/english.lang
index a833f4b7..3fd31695 100644
--- a/Languages/english.lang
+++ b/Languages/english.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-12 18:58+0100\n"
+"POT-Creation-Date: 2011-11-15 21:46+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 msgid " could not be downloaded."
 msgstr ""
diff --git a/Languages/finnish.lang b/Languages/finnish.lang
index e300885b..8103b090 100644
--- a/Languages/finnish.lang
+++ b/Languages/finnish.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-12 18:58+0100\n"
+"POT-Creation-Date: 2011-11-15 21:46+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: c64rmx\n"
 "Language-Team: \n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 msgid " could not be downloaded."
 msgstr "Latausta ei voitu suorittaa"
diff --git a/Languages/french.lang b/Languages/french.lang
index 42362e40..b1fb574e 100644
--- a/Languages/french.lang
+++ b/Languages/french.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-12 18:58+0100\n"
+"POT-Creation-Date: 2011-11-15 21:46+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: Cyan\n"
 "Language-Team: Badablek, Amour, ikya, Cyan & Kin8\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 msgid " could not be downloaded."
 msgstr " ne peut pas être téléchargé."
@@ -203,7 +203,7 @@ msgid "Backgroundmusic"
 msgstr "Fond sonore"
 
 msgid "Beginning"
-msgstr ""
+msgstr "Début"
 
 msgid "Big thanks to:"
 msgstr "Grand merci à:"
@@ -318,7 +318,7 @@ msgid "Change Play Path"
 msgstr "Changer dossier"
 
 msgid "Channels"
-msgstr ""
+msgstr "Chaînes"
 
 msgid "Cheatfile is blank"
 msgstr "Fichier de triche vide"
@@ -370,7 +370,7 @@ msgid "Console should be unlocked to modify it."
 msgstr "La console doit être déverrouillée."
 
 msgid "Content"
-msgstr ""
+msgstr "Contenu"
 
 msgid "Continue to install game?"
 msgstr "Continuer l'installation ?"
@@ -667,7 +667,7 @@ msgid "Exit to where?"
 msgstr "Quitter vers où ?"
 
 msgid "Export All Saves to EmuNand"
-msgstr "Extraire tous les sauvegardes"
+msgstr "Extraire toutes les sauvegardes"
 
 msgid "Extract Save to EmuNand"
 msgstr "Extraire la sauvegarde vers Émulation Nand"
@@ -1016,7 +1016,7 @@ msgid "Load this DOL as alternate DOL?"
 msgstr "Charger comme DOL alternatif ?"
 
 msgid "Loader Mode"
-msgstr ""
+msgstr "Mode du Loader"
 
 msgid "Loader Settings"
 msgstr "Paramètres du Loader"
@@ -1076,10 +1076,10 @@ msgid "Music Volume"
 msgstr "Volume musique"
 
 msgid "Nand Channel Emulation"
-msgstr ""
+msgstr "Émulation Nand Chaînes"
 
 msgid "Nand Emu Channel Path"
-msgstr ""
+msgstr "Dossier ÉmuNand Chaînes"
 
 msgid "Nand Emu Path"
 msgstr "Dossier Émulation Nand"
@@ -1094,7 +1094,7 @@ msgid "Nand Emulation only works on FAT/FAT32 partitions!"
 msgstr "L'Émulation Nand ne fonctionne qu'avec une partition FAT/FAT32!"
 
 msgid "Nand Saves Emulation"
-msgstr ""
+msgstr "Émul. Nand Sauvegardes"
 
 msgid "Neither"
 msgstr "Aucun"
@@ -1382,7 +1382,7 @@ msgid "Screensaver"
 msgstr "Économiseur d'écran"
 
 msgid "Search Mode"
-msgstr ""
+msgstr "Mode de recherche"
 
 msgid "Select"
 msgstr "Choisir"
diff --git a/Languages/german.lang b/Languages/german.lang
index 926f02bd..ab829a74 100644
--- a/Languages/german.lang
+++ b/Languages/german.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-12 18:58+0100\n"
+"POT-Creation-Date: 2011-11-15 21:46+0100\n"
 "PO-Revision-Date: 2010-07-03 17:35-0800\n"
 "Last-Translator: TheRealVisitor\n"
 "Language-Team: Bertilax, Snoozer, wishmasterf, ZEN.13, TheRealVisitor\n"
-"Language: German\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: German\n"
 
 msgid " could not be downloaded."
 msgstr " konnte nicht heruntergeladen werden."
diff --git a/Languages/hungarian.lang b/Languages/hungarian.lang
index d118434f..4428a217 100644
--- a/Languages/hungarian.lang
+++ b/Languages/hungarian.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-12 18:58+0100\n"
+"POT-Creation-Date: 2011-11-15 21:46+0100\n"
 "PO-Revision-Date: 2009-12-29 11:05+0100\n"
 "Last-Translator: Springdale\n"
 "Language-Team: Tusk, Springdale\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 msgid " could not be downloaded."
 msgstr "nem letölthetõ."
diff --git a/Languages/italian.lang b/Languages/italian.lang
index 2e929e89..1b364a6a 100644
--- a/Languages/italian.lang
+++ b/Languages/italian.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-12 18:58+0100\n"
+"POT-Creation-Date: 2011-11-15 21:46+0100\n"
 "PO-Revision-Date: 2011-09-11 12:19+0100\n"
-"Last-Translator: xFede, Bovirus \n"
+"Last-Translator: xFede\n"
 "Language-Team: Cambo\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 msgid " could not be downloaded."
 msgstr " non può essere scaricato."
@@ -203,7 +203,7 @@ msgid "Backgroundmusic"
 msgstr "Musica di sottofondo"
 
 msgid "Beginning"
-msgstr ""
+msgstr "Dall'inizio"
 
 msgid "Big thanks to:"
 msgstr "Grazie mille a:"
@@ -318,7 +318,7 @@ msgid "Change Play Path"
 msgstr "Cambia Percorso Musica"
 
 msgid "Channels"
-msgstr ""
+msgstr "Canali"
 
 msgid "Cheatfile is blank"
 msgstr "Il file dei trucchi è vuoto"
@@ -370,7 +370,7 @@ msgid "Console should be unlocked to modify it."
 msgstr "La Wii deve essere sbloccata per modificarla."
 
 msgid "Content"
-msgstr ""
+msgstr "Nel contenuto"
 
 msgid "Continue to install game?"
 msgstr "Proseguire con l'installarazione del gioco?"
@@ -542,7 +542,7 @@ msgid "Do you want to load the default theme?"
 msgstr "Vuoi caricare il tema predefinito?"
 
 msgid "Do you want to re-init network?"
-msgstr "Reiniziallizzare la rete?"
+msgstr "Vuoi reinizializzare la rete?"
 
 msgid "Do you want to sync free space info sector on all FAT32 partitions?"
 msgstr "Vuoi sincronizzare le info sullo spazio libero in tutte le partizioni FAT32?"
@@ -590,7 +590,7 @@ msgid "Downloading pagelist:"
 msgstr "Scaricando l'anteprima di:"
 
 msgid "Dump NAND to EmuNand"
-msgstr "Dump NAND in EmuNand"
+msgstr "Dumpa la NAND sulla NAND Emulata"
 
 msgid "Dutch"
 msgstr "Olandese"
@@ -608,7 +608,7 @@ msgid "English"
 msgstr "Inglese"
 
 msgid "Enter Path"
-msgstr "Ins. percorso"
+msgstr "Ins. Percorso"
 
 msgid "Error"
 msgstr "Errore"
@@ -682,7 +682,7 @@ msgid "Extracting files:"
 msgstr "Estraendo i file:"
 
 msgid "Extracting nand files:"
-msgstr "Estrazione file NAND:"
+msgstr "Estraendo il file della NAND:"
 
 msgid "Failed"
 msgstr "Fallito"
@@ -767,7 +767,7 @@ msgid "French"
 msgstr "Francese"
 
 msgid "Full"
-msgstr "Pieno"
+msgstr "Completa"
 
 msgid "Full Cover Path"
 msgstr "Percorso Cop. Complete"
@@ -985,13 +985,13 @@ msgid "Language Files"
 msgstr "File di Lingua"
 
 msgid "Language change:"
-msgstr "Cambia lingua:"
+msgstr "Cambia Lingua:"
 
 msgid "Languagefiles Path"
-msgstr "Percorso dei file di lingua"
+msgstr "Percorso File di Lingua"
 
 msgid "Languagepath changed."
-msgstr "Percorso dei file di lingua cambiato."
+msgstr "Percorso dei File di Lingua cambiato."
 
 msgid "Left"
 msgstr "Sinistra"
@@ -1016,7 +1016,7 @@ msgid "Load this DOL as alternate DOL?"
 msgstr "Usare questo DOL come DOL alternativo?"
 
 msgid "Loader Mode"
-msgstr ""
+msgstr "Modalità"
 
 msgid "Loader Settings"
 msgstr "Impostazioni Loader"
@@ -1076,10 +1076,10 @@ msgid "Music Volume"
 msgstr "Volume Musica"
 
 msgid "Nand Channel Emulation"
-msgstr ""
+msgstr "Emulazione Canali"
 
 msgid "Nand Emu Channel Path"
-msgstr ""
+msgstr "Percorso Emulazione Canali "
 
 msgid "Nand Emu Path"
 msgstr "Percorso NAND Emulata"
@@ -1094,7 +1094,7 @@ msgid "Nand Emulation only works on FAT/FAT32 partitions!"
 msgstr "L'emulazione della NAND funziona solo con le partizioni FAT/FAT32!"
 
 msgid "Nand Saves Emulation"
-msgstr ""
+msgstr "Emulazione Salvataggi"
 
 msgid "Neither"
 msgstr "Neanche"
@@ -1517,7 +1517,7 @@ msgid "The entered directory does not exist. Would you like to create it?"
 msgstr "La cartella specificata non esiste. Vuoi crearla ora?"
 
 msgid "The files will be extracted to your emu nand path. Attention: All existing files will be overwritten."
-msgstr "I file verranno estratti nel percorso emu nand. Attenzione: i file esistenti verranno sovrascritti."
+msgstr "I file verranno estratti nel percorso della NAND Emulata. NB: Tutti I file esistenti verranno sovrascritti."
 
 msgid "The game installation is disabled under this IOS because of instability in usb write."
 msgstr "L'installazione dei giochi è disabilitata con questo IOS dato che la scrittura sul disco rigido è instabile"
@@ -1681,7 +1681,7 @@ msgid "What should be deleted for this game title:"
 msgstr "Cosa deve essere eliminato per questo gioco:"
 
 msgid "What to extract from NAND?"
-msgstr "Cosa estrarre dalla NAND"
+msgstr "Che cosa vuoi estrarre dalla NAND?"
 
 msgid "WiFi Features"
 msgstr "Funzionalità WiFi"
@@ -1699,10 +1699,10 @@ msgid "Wii Settings"
 msgstr "Impostazioni Wii"
 
 msgid "WiiTDB.xml"
-msgstr "WiiTDB.xml"
+msgstr ""
 
 msgid "WiiTDB.xml is up to date."
-msgstr ""
+msgstr "WiiTDB.xml è già aggiornato"
 
 msgid "Wiilight"
 msgstr "Illuminazione Wii"
diff --git a/Languages/japanese.lang b/Languages/japanese.lang
index 4963ffc0..d820f0ed 100644
--- a/Languages/japanese.lang
+++ b/Languages/japanese.lang
@@ -1,5 +1,5 @@
 # USB Loader GX language source file.
-# japanese.lang - r1117
+# japanese.lang - r1128
 # don't delete/change this line (e).
 msgid ""
 msgstr ""
@@ -8,11 +8,11 @@ msgstr ""
 "POT-Creation-Date: 2011-11-12 18:58+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: hosigumayuugi\n"
-"Language-Team: hosigumayuugi, papa, ichiroling\n"
-"Language: \n"
+"Language-Team: hosigumayuugi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 msgid " could not be downloaded."
 msgstr "ﾀﾞｳﾝﾛｰﾄﾞできませんでした"
@@ -203,7 +203,7 @@ msgid "Backgroundmusic"
 msgstr "BGM"
 
 msgid "Beginning"
-msgstr ""
+msgstr "前方一致"
 
 msgid "Big thanks to:"
 msgstr "協力:"
@@ -318,7 +318,7 @@ msgid "Change Play Path"
 msgstr "パスの変更"
 
 msgid "Channels"
-msgstr ""
+msgstr "チャンネル"
 
 msgid "Cheatfile is blank"
 msgstr "チートファイルがありません"
@@ -370,7 +370,7 @@ msgid "Console should be unlocked to modify it."
 msgstr "変更にはロックの解除が必要です"
 
 msgid "Content"
-msgstr ""
+msgstr "含む"
 
 msgid "Continue to install game?"
 msgstr "このｹﾞｰﾑをｲﾝｽﾄｰﾙしますか？"
@@ -542,7 +542,7 @@ msgid "Do you want to load the default theme?"
 msgstr "標準のテーマを読み込みますか?"
 
 msgid "Do you want to re-init network?"
-msgstr ""
+msgstr "ネットワークに再接続しますか?"
 
 msgid "Do you want to sync free space info sector on all FAT32 partitions?"
 msgstr "全てのFAT32領域のセクタで空き容量情報を同期しますか？"
@@ -848,7 +848,7 @@ msgid "Gamename [GAMEID]"
 msgstr "ゲーム名 [ゲームID]"
 
 msgid "Games"
-msgstr "ゲーム総数"
+msgstr "ゲーム"
 
 msgid "Generating GXGameCategories.xml"
 msgstr "GXGameCategories.xmlを作成中です"
@@ -982,7 +982,7 @@ msgid "Korean"
 msgstr "韓国語"
 
 msgid "Language Files"
-msgstr ""
+msgstr "言語ファイル"
 
 msgid "Language change:"
 msgstr "言語の変更"
@@ -1016,7 +1016,7 @@ msgid "Load this DOL as alternate DOL?"
 msgstr "このDOLを代替DOLとしてﾛｰﾄﾞしますか？"
 
 msgid "Loader Mode"
-msgstr ""
+msgstr "ローダーモード"
 
 msgid "Loader Settings"
 msgstr "ローダーの設定"
@@ -1076,25 +1076,25 @@ msgid "Music Volume"
 msgstr "BGMの音量"
 
 msgid "Nand Channel Emulation"
-msgstr ""
+msgstr "NANDチャンネルエミュ"
 
 msgid "Nand Emu Channel Path"
-msgstr ""
+msgstr "NANDエミュチャンネル"
 
 msgid "Nand Emu Path"
 msgstr "NANDエミュ"
 
 msgid "Nand Emulation"
-msgstr "NANDエミュレーション"
+msgstr "NANDエミュ"
 
 msgid "Nand Emulation is only available on D2X cIOS!"
-msgstr "NANDエミュレーションはd2x cIOSのみで動作します!"
+msgstr "NANDエミュはd2x cIOSのみで動作します!"
 
 msgid "Nand Emulation only works on FAT/FAT32 partitions!"
-msgstr "NANDエミュレーションはFAT/FAT32領域のみで動作します!"
+msgstr "NANDエミュはFAT/FAT32領域のみで動作します!"
 
 msgid "Nand Saves Emulation"
-msgstr ""
+msgstr "NANDセーブエミュ"
 
 msgid "Neither"
 msgstr "非表示"
@@ -1382,7 +1382,7 @@ msgid "Screensaver"
 msgstr "スクリーンセーバー"
 
 msgid "Search Mode"
-msgstr ""
+msgstr "検索方法"
 
 msgid "Select"
 msgstr "選択"
@@ -1699,10 +1699,10 @@ msgid "Wii Settings"
 msgstr "データ管理"
 
 msgid "WiiTDB.xml"
-msgstr ""
+msgstr "ゲーム名リスト"
 
 msgid "WiiTDB.xml is up to date."
-msgstr ""
+msgstr "ゲーム名リストが更新されました"
 
 msgid "Wiilight"
 msgstr "スロット点灯機能"
diff --git a/Languages/korean.lang b/Languages/korean.lang
index d56180bd..5cce1e8e 100644
--- a/Languages/korean.lang
+++ b/Languages/korean.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-12 18:58+0100\n"
+"POT-Creation-Date: 2011-11-15 21:46+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: nextos@korea.com\n"
 "Language-Team: \n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 msgid " could not be downloaded."
 msgstr " 다운로드할수 없음."
diff --git a/Languages/norwegian.lang b/Languages/norwegian.lang
index 25d7f8c0..d733a8a1 100644
--- a/Languages/norwegian.lang
+++ b/Languages/norwegian.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-12 18:58+0100\n"
+"POT-Creation-Date: 2011-11-15 21:46+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: raschi\n"
 "Language-Team: raschi\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 msgid " could not be downloaded."
 msgstr " kan ikke lastes ned."
diff --git a/Languages/polish.lang b/Languages/polish.lang
index 16fd996d..97251824 100644
--- a/Languages/polish.lang
+++ b/Languages/polish.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-12 18:58+0100\n"
+"POT-Creation-Date: 2011-11-15 21:46+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: ziom666 (zadania_prog@vp.pl)\n"
 "Language-Team: \n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 msgid " could not be downloaded."
 msgstr " nie udalo sie pobrac"
diff --git a/Languages/portuguese_br.lang b/Languages/portuguese_br.lang
index a30017dc..50861aa1 100644
--- a/Languages/portuguese_br.lang
+++ b/Languages/portuguese_br.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-12 18:58+0100\n"
+"POT-Creation-Date: 2011-11-15 21:46+0100\n"
 "PO-Revision-Date: 2009-10-23 18:52+0200\n"
 "Last-Translator: aniemotion\n"
 "Language-Team: boto12, aniemotion\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 msgid " could not be downloaded."
 msgstr " não foi baixado."
diff --git a/Languages/portuguese_pt.lang b/Languages/portuguese_pt.lang
index e705d45b..ffb97e73 100644
--- a/Languages/portuguese_pt.lang
+++ b/Languages/portuguese_pt.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-12 18:58+0100\n"
+"POT-Creation-Date: 2011-11-15 21:46+0100\n"
 "PO-Revision-Date: 2011-11-03 11:00+0000\n"
 "Last-Translator: pplucky <pplucky@gmail.com>\n"
 "Language-Team: Sky8000, pplucky\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 msgid " could not be downloaded."
 msgstr " não foi descarregado."
diff --git a/Languages/russian.lang b/Languages/russian.lang
index 2ec1b295..c7cb3f21 100644
--- a/Languages/russian.lang
+++ b/Languages/russian.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-12 18:58+0100\n"
+"POT-Creation-Date: 2011-11-15 21:46+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: nikolai_ca\n"
 "Language-Team: Kir, alendit, nikolai_ca\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 msgid " could not be downloaded."
 msgstr " не мог быть загружен"
diff --git a/Languages/schinese.lang b/Languages/schinese.lang
index 848eb89a..71a013d6 100644
--- a/Languages/schinese.lang
+++ b/Languages/schinese.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-12 18:58+0100\n"
+"POT-Creation-Date: 2011-11-15 21:46+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: knife.hu kavid emul8ion\n"
 "Language-Team: kavid\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 msgid " could not be downloaded."
 msgstr "不能下载."
diff --git a/Languages/spanish.lang b/Languages/spanish.lang
index 5573a970..05f8f04e 100644
--- a/Languages/spanish.lang
+++ b/Languages/spanish.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-12 18:58+0100\n"
+"POT-Creation-Date: 2011-11-15 21:46+0100\n"
 "PO-Revision-Date: 2011-07-25 16:40+0200\n"
 "Last-Translator: Galen/xFede\n"
 "Language-Team: Penn, SirPalax, hvy109\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 msgid " could not be downloaded."
 msgstr " no se han podido descargar."
diff --git a/Languages/swedish.lang b/Languages/swedish.lang
index d645c0ec..c893189e 100644
--- a/Languages/swedish.lang
+++ b/Languages/swedish.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-12 18:58+0100\n"
+"POT-Creation-Date: 2011-11-15 21:46+0100\n"
 "PO-Revision-Date: 2010-01-19 17:39+0200\n"
 "Last-Translator: Katsurou\n"
 "Language-Team: Katsurou, pirateX\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 msgid " could not be downloaded."
 msgstr "Kunde inte laddas ner."
diff --git a/Languages/tchinese.lang b/Languages/tchinese.lang
index b0dd6f64..4c1f0b77 100644
--- a/Languages/tchinese.lang
+++ b/Languages/tchinese.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-12 18:58+0100\n"
+"POT-Creation-Date: 2011-11-15 21:46+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"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 msgid " could not be downloaded."
 msgstr "不能下載。"
diff --git a/Languages/thai.lang b/Languages/thai.lang
index 5223ca9f..5960a317 100644
--- a/Languages/thai.lang
+++ b/Languages/thai.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-12 18:58+0100\n"
+"POT-Creation-Date: 2011-11-15 21:46+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: Nitro_subzero \n"
 "Language-Team: Nitro_subzero\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 msgid " could not be downloaded."
 msgstr " ไม่สามารถดาวน์โหลดได้"
diff --git a/Languages/turkish.lang b/Languages/turkish.lang
index 3b273951..9bb1cbad 100644
--- a/Languages/turkish.lang
+++ b/Languages/turkish.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-12 18:58+0100\n"
+"POT-Creation-Date: 2011-11-15 21:46+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: omercigingelini\n"
 "Language-Team: omercigingelini\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 msgid " could not be downloaded."
 msgstr " indirilemedi."
diff --git a/source/patches/patchcode.c b/source/patches/patchcode.c
index a13c02cc..bcafe68d 100644
--- a/source/patches/patchcode.c
+++ b/source/patches/patchcode.c
@@ -722,14 +722,14 @@ static int LoadGameConfig(const char *CheatFilepath)
 	return 0;
 }
 
-int ocarina_load_code(const char *CheatFilepath)
+int ocarina_load_code(const char *CheatFilepath, u8 *gameid)
 {
 	char filepath[150];
 
 	gprintf("Ocarina: Searching codes...");
 	gprintf("\n");
 
-	sprintf(filepath, "%s%.6s", CheatFilepath, (char *) Disc_ID);
+	sprintf(filepath, "%s%.6s", CheatFilepath, gameid);
 	filepath[strlen(CheatFilepath) + 6] = 0x2E;
 	filepath[strlen(CheatFilepath) + 7] = 0x67;
 	filepath[strlen(CheatFilepath) + 8] = 0x63;
diff --git a/source/patches/patchcode.h b/source/patches/patchcode.h
index 8a2f53a3..6728372d 100644
--- a/source/patches/patchcode.h
+++ b/source/patches/patchcode.h
@@ -35,7 +35,7 @@ void load_handler(u32 hooktype, u32 debugger, u32 pauseAtStart);
 void langpatcher(void *addr, u32 len, u8 languageChoice);
 void vidolpatcher(void *addr, u32 len);
 void patchdebug(void *addr, u32 len);
-int ocarina_load_code(const char *CheatFilepath);
+int ocarina_load_code(const char *CheatFilepath, u8 *gameid);
 
 #ifdef __cplusplus
 }
diff --git a/source/usbloader/AlternateDOLOffsets.cpp b/source/usbloader/AlternateDOLOffsets.cpp
index 278a4daa..fed6bc5e 100644
--- a/source/usbloader/AlternateDOLOffsets.cpp
+++ b/source/usbloader/AlternateDOLOffsets.cpp
@@ -192,6 +192,20 @@ int autoSelectDolPrompt(const char *gameid)
 		else if(choice == 0)
 			return 0;
 	}
+	//The Legend of Zelda - Skyward Sword
+	else if (strcmp(id, "SOUE01") == 0)
+	{
+		int choice = WindowPrompt(tr( "Select a DOL" ), 0, tr("Motion+ Video"), tr("Pick from a list"), tr( "Cancel" ));
+		if(choice == 1)
+			return 836;//from cheatfreak47
+	}
+	//The Legend of Zelda - Skyward Sword
+	else if (strcmp(id, "SOUP01") == 0)
+	{
+		int choice = WindowPrompt(tr( "Select a DOL" ), 0, tr("Motion+ Video"), tr("Pick from a list"), tr( "Cancel" ));
+		if(choice == 1)
+			return 974;//from Cyan
+	}
 	//Virtual Tennis 2009
 	else if (strcmp(id, "RVUP8P") == 0)
 	{
diff --git a/source/usbloader/GameBooter.cpp b/source/usbloader/GameBooter.cpp
index 17df0821..3db2bbc3 100644
--- a/source/usbloader/GameBooter.cpp
+++ b/source/usbloader/GameBooter.cpp
@@ -270,7 +270,7 @@ int GameBooter::BootGame(const char * gameID)
 
 	//! Load Ocarina codes
 	if (ocarinaChoice)
-		ocarina_load_code(Settings.Cheatcodespath);
+		ocarina_load_code(Settings.Cheatcodespath, gameHeader.id);
 
 	//! Setup disc stuff if we load a game
 	if(Settings.LoaderMode != LOAD_CHANNELS)