From d7350ff3864a62013e224aeffe10a7d83f094b19 Mon Sep 17 00:00:00 2001 From: dimok321 <15055714+dimok789@users.noreply.github.com> Date: Wed, 20 May 2009 08:03:22 +0000 Subject: [PATCH] *Little fixes. *Language files. --- Languages/korean | 60 +++++++++++++++++----------------- Languages/spanish | 2 +- source/libwiigui/gui_sound.cpp | 2 +- source/menu.cpp | 6 ++-- source/oggplayer.c | 1 + 5 files changed, 37 insertions(+), 34 deletions(-) diff --git a/Languages/korean b/Languages/korean index 1ccc6380..827732f1 100644 --- a/Languages/korean +++ b/Languages/korean @@ -1,21 +1,21 @@ Specialthanksto = Special thanks to t3Covers = 3D Ç¥Áö -AppLanguage = ¾îÇø®ÄÉÀÌ¼Ç ¾ð¾î +AppLanguage = USB ·Î´õ ¾ð¾î Areyousure = È®½ÇÇմϱî? AutoPatch = ÀÚµ¿ ÆÐÄ¡ Back = µÚ·Î BacktoHBCorWiiMenu = Ȩºê·ù ¸Þ´º ¶Ç´Â Wii ¸Þ´º·Î -BacktoLoader = Loader·Î µ¹¾Æ°¡±â +BacktoLoader = ·Î´õ·Î µ¹¾Æ°¨ BacktoWiiMenu = Wii ¸Þ´º·Î ³î¾Æ°¡±â -BootStandard = ºÎÆ®/±âº» +BootStandard = ±âº» ºÎÆü³Á¤ BothBoth = ÀüºÎ Ç¥½Ã Cantcreatedirectory = µð·ºÅ丮¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù Cancel = Ãë¼Ò Cantbeformated = Æ÷¸ËÇÒ ¼ö ¾ø½À´Ï´Ù. Cantdelete = »èÁ¦ÇÒ ¼ö ¾ø½À´Ï´Ù: -ClicktoDownloadCovers = Ç¥Áö¸¦ ´Ù¿î ¹ÞÀ¸·Á¸é Ŭ¸¯Çϼ¼¿ä. +ClicktoDownloadCovers = Ç¥Áö¸¦ ´Ù¿îÇÏ·Á¸é Ŭ¸¯Çϼ¼¿ä Clock = ½Ã°è -Continueinstallgame = °ÔÀÓÀ» ¼³Ä¡ÇÏ°Ú½À´Ï±î? +Continueinstallgame = °è¼Ó ¼³Ä¡ÇÏ°Ú½À´Ï±î? ConsoleDefault = ÄÜ¼Ö ±âº»°ª Consoleshouldbeunlockedtomodifyit = º¯°æÇÏ·Á¸é ÄÜ¼Ö Àá±èÀ» ÇØÁ¦Çϼ¼¿ä. ConsoleLocked = ÄÜ¼Ö Àá±è @@ -30,28 +30,28 @@ Coverpathchange = Ç¥ Credits = Credits DiscImages = µð½ºÅ© À̹ÌÁö DiscimagePath = µð½ºÅ© À̹ÌÁö °æ·Î -DiscpathChanged = »õ·Î¿î µð½ºÅ© °æ·Î +DiscpathChanged = µð½ºÅ© °æ·Î º¯°æµÊ Discpathchange = µð½ºÅ© °æ·Î º¯°æ DiscDefault = µð½ºÅ© ±âº»°ª Display = È­¸é Ç¥½Ã Doyouwanttoformat = Æ÷¸ËÇÏ°Ú½À´Ï±î: Doyoureallywanttodelete = Á¤¸»·Î »èÁ¦ÇÏ°Ú½À´Ï±î: Doyouwanttoretryfor30secs = 30ÃÊ°£ Àç½Ãµµ ÇÒ±î¿ä? -Downloadingfile = ÆÄÀÏÀ» ´Ù¿î·ÎµåÇÕ´Ï´Ù: +Downloadingfile = ÆÄÀÏ ´Ù¿î·Îµå Áß: DownloadBoxartimage = ¹Ú½º À̹ÌÁö¸¦ ´Ù¿î·Îµå ÇÒ±î¿ä? Downloadfinished = ´Ù¿î·Îµå ¿Ï·á Error = ¿¡·¯ ! BOOTERROR = ºÎÆà ¿¡·¯ ErrorreadingDisc = µð½ºÅ© Àб⠿À·ù -ExitUSBISOLoader = USB Loader GX¸¦ Á¾·áÇÏ°Ú½À´Ï±î? +ExitUSBISOLoader = USB·Î´õ GX¸¦ Á¾·áÇÒ±î¿ä? InitializingNetwork = ³×Æ®¿öÅ© ÃʱâÈ­ InsertDisk = µð½ºÅ©¸¦ ³Ö¾îÁÖ¼¼¿ä InsertaWiiDisc = Wii µð½ºÅ©¸¦ ³ÖÀ¸¼¼¿ä! InsertaSDCardtodownloadimages = ´Ù¿î¹ÞÀº À̹ÌÁö¸¦ ÀúÀåÇÒ SDÄ«µå¸¦ ³ÖÀ¸¼¼¿ä. InsertaSDCardtosave = ÀúÀåÇÒ SDÄ«µå¸¦ ³ÖÀ¸¼¼¿ä. -InstallRenameandDeleteareunlocked = USB Loader GXÀÇ ¸ðµç ±â´É Àá±ÝÇØÁ¦. +InstallRenameandDeleteareunlocked = USB·Î´õ GX ±â´É Àá±Ý ÇØÁ¦. Installerror = ¼³Ä¡ ¿¡·¯! -Installagame = °ÔÀÓ ¼³Ä¡ +Installagame = °ÔÀÓÀ» ¼³Ä¡ÇÒ±î¿ä Installinggame = °ÔÀÓ ¼³Ä¡ Áß: Failedtoboot = ºÎÆà ½ÇÆÐ: FailedtomountfrontSDcard = SDÄ«µå ÀÎ½Ä ½ÇÆÐ @@ -59,11 +59,11 @@ FailedtosetUSB = USB Failedformating = Æ÷¸Ë ½ÇÆÐ filesnotfoundontheserver = ÆÄÀÏÀÌ ¼­¹ö¿¡ ¾ø½À´Ï´Ù! filesleft = ÆÄÀÏ ³²À½ -FlipX = Flip-X +FlipX = ÁÂ/¿ì ¼³Á¤ Force = °­Á¦ Youneedtoformatapartition = ÆÄƼ¼ÇÀ» Æ÷¸ËÇØ¾ß ÇÕ´Ï´Ù Format = Æ÷¸Ë -Formattingpleasewait = Æ÷¸Ë ÁßÀÔ´Ï´Ù, ±â´Ù·Á ÁÖ¼¼¿ä... +Formattingpleasewait = Æ÷¸Ë Áß. ±â´Ù·Á ÁÖ¼¼¿ä... formated = Æ÷¸Ë ¿Ï·á! free = ³²À½ FreeSpace = ¿©À¯ °ø°£ @@ -74,22 +74,22 @@ Gameisalreadyinstalled = GameRegion = Áö¿ª GameSize = °ÔÀÓ ¿ë·® GoBack = µÚ·Î °¡±â -//GotoPage = ÆäÀÌÁö·Î °¡±â +//GotoPage = ÆäÀÌÁö HowtoShutdown = ¾î¶»°Ô Á¾·áÇÒ±î¿ä? Language = ¾ð¾î Langchange = ¾ð¾î º¯°æ Left = ¿ÞÂÊ -LikeSysMenu = ¼¼½ºÅÛ ¸Þ´ºÃ³·³ +LikeSysMenu = ½Ã½ºÅÛ ¸Þ´ºÃ³·³ LoadingincIOS = cIOS249·Î ·Îµù Lock = Àá±Ý LockConsole = ÄÜ¼Ö Àá±Ý MP3Menu = MP3 ¸Þ´º -Missingfiles = ºüÁø ÆÄÀÏ +Missingfiles = ÆÄÀÏ ´©¶ô Networkiniterror = ³×Æ®¿öÅ© ÃʱâÈ­ ¿¡·¯ Neither = Ç¥½Ã ¾øÀ½ Next = ´ÙÀ½ No = ¾Æ´Ï¿À -Nofilemissing = ºüÁø ÆÄÀÏ ¾øÀ½! +Nofilemissing = ´©¶ô ÆÄÀÏ ¾øÀ½! NoHDDfound = ÇÏµå µð½ºÅ©°¡ ¾ø½À´Ï´Ù! NoSDcardinserted = SDÄ«µå°¡ ¾ø½À´Ï´Ù! Nopartitionsfound = ÆÄƼ¼ÇÀÌ ¾ø½À´Ï´Ù. @@ -104,35 +104,35 @@ notset = of = Áß OFF = ²¨Áü OfficialSite = °ø½Ä »çÀÌÆ® -ok = OK +ok = È®ÀÎ ON = ÄÑÁü -Parentalcontrol = ÆÄƼ¼Ç Á¦¾î +Parentalcontrol = Àڳຸȣ±â´É Partition = ÆÄƼ¼Ç Password = ºñ¹Ð¹øÈ£ -PasswordChanged = »õ·Î¿î ºñ¹Ð¹øÈ£ +PasswordChanged = ºñ¹Ð¹øÈ£ º¯°æµÊ Passwordhasbeenchanged = ºñ¹Ð¹øÈ£°¡ º¯°æµÇ¾ú½À´Ï´Ù Passwordchange = ºñ¹Ð¹øÈ£ º¯°æ PowerofftheWii = Wii Àü¿ø ²ô±â Prev = ÀÌÀü -PromptsButtons = ÇÁ·ÒÇÁÆ® ¹öÆ° -ReloadSD = SDÄ«µå ´Ù½Ã Àбâ -RenameGameonWBFS = WBFS¿¡¼­ °ÔÀÓ À̸§ ¹Ù²Ù±â +PromptsButtons = ÇÁ·ÒÇÁÆ®/¹öÆ° +ReloadSD = SDÄ«µå Àбâ +RenameGameonWBFS = WBFS¿¡¼­ °ÔÀÓ À̸§ º¯°æ Restart = ´Ù½Ã ½ÃÀÛ Return = µ¹¾Æ°¡±â -ReturntoWii = Wii ¸Þ´º·Î µ¹¾Æ°¡±â +ReturntoWii = Wii·Î µ¹¾Æ°¡±â Right = ¿À¸¥ÂÊ Rumble = Áøµ¿ -QuickBoot = ÄüºÎÆ® +QuickBoot = °ÔÀÓ ¹Ù·Î½ÇÇà Save = ÀúÀå SaveFailed = ÀúÀå ½ÇÆÐ Specialthanksto = Special thanks to For = for -theUSBLoaderandreleasingthesourcecodethe = ¼Ò½º ÄÚµå ¹èÆ÷ +theUSBLoaderandreleasingthesourcecodethe = and releasing the source code secondsleft = ÃÊ ³²¾Ò½À´Ï´Ù SelectthePartition = Æ÷¸ËÇÏ·Á´Â youwanttoformat = ÆÄƼ¼ÇÀ» ¼±ÅÃÇϼ¼¿ä settings = ¼³Á¤ -ShutdowntoIdle = Idle»óÅ·ΠÁ¾·á +ShutdowntoIdle = ´ë±â »óÅ·ΠShutdownSystem = ½Ã½ºÅÛ Á¾·á Success = ¼º°ø: Successfullyinstalled = ¼³Ä¡ ¼º°ø: @@ -147,15 +147,15 @@ Tooltips = Tooltips Timeleft = ³²Àº ½Ã°£: Unlock = Àá±ÝÇØÁ¦ Uninstall = Á¦°Å -USBLoaderisprotected = USB Loader GX º¸È£¸ðµå +USBLoaderisprotected = USB ·Î´õ GX Àá±è »óÅ USBDevicenotfound = USB ÀåÄ¡°¡ ¾ø½À´Ï´Ù. VideoMode = ºñµð¿À ¸ðµå VIDTVPatch = VIDTV ÆÐÄ¡ -Volume = º¼·ý +Volume = À½·® Waiting = ±â´Ù¸®´Â Áß... WaitingforUSBDevice = USB ÀåÄ¡¸¦ ±â´Ù¸®´Â Áß -WidescreenFix = ¿ÍÀÌµå ½ºÅ©¸° Fix -WiiMenu = Wii ¸Þ´º +WidescreenFix = ¿ÍÀÌµå ½ºÅ©¸°¿¡ ¸ÂÃã +WiiMenu = Wii ¸Þ´º·Î WrongPassword = À߸øµÈ ºñ¹Ð¹øÈ£ Yes = ¿¹ YoudonthavecIOS = cIOS222°¡ ¾ø½À´Ï´Ù. diff --git a/Languages/spanish b/Languages/spanish index 7a3e3671..9773b960 100644 --- a/Languages/spanish +++ b/Languages/spanish @@ -17,7 +17,7 @@ Clock = Reloj Continueinstallgame = ¿Continuar instalando juego? ConsoleDefault = Pred. Consola - Consoleshouldbeunlockedtomodifyit = Consola debe desbloquearse para modificarla. + Consoleshouldbeunlockedtomodifyit = Debes desbloquear la consola para modificar. ConsoleLocked = Consola Bloqueada CorrectPassword = Contraseña Correcta Couldnotinitializenetwork = ¡No se pudo iniciar la Conexión! diff --git a/source/libwiigui/gui_sound.cpp b/source/libwiigui/gui_sound.cpp index e37fddb6..8c4a4265 100644 --- a/source/libwiigui/gui_sound.cpp +++ b/source/libwiigui/gui_sound.cpp @@ -89,7 +89,7 @@ void GuiSound::Play() break; case SOUND_OGG: - voice = ASND_GetFirstUnusedVoice(); + voice = 0; if(loop) PlayOgg(mem_open((char *)sound, length), 0, OGG_INFINITE_TIME); else diff --git a/source/menu.cpp b/source/menu.cpp index 0feaaa65..133f878b 100644 --- a/source/menu.cpp +++ b/source/menu.cpp @@ -5127,7 +5127,7 @@ int MenuOGG() backBtn.SetTrigger(&trigB); backBtn.SetEffectGrow(); - customOptionList options2(300); + customOptionList options2(countmp3); for (cnt = 0; cnt < countmp3; cnt++) { snprintf(options2.value[cnt], 30, "%s", mp3files[cnt]); @@ -5144,7 +5144,7 @@ int MenuOGG() GuiCustomOptionBrowser optionBrowser4(396, 280, &options2, CFG.theme_path, "bg_options_settings.png", bg_options_settings_png, scrollon, 85); optionBrowser4.SetPosition(0, 90); optionBrowser4.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); - optionBrowser4.SetCol2Position(45); + optionBrowser4.SetCol2Position(30); int songPlaying=0; @@ -5257,6 +5257,7 @@ int MenuOGG() if(isSdInserted() == 1) { cfg_save_global(); if(!strcmp("", CFG.oggload_path)) { + sprintf(CFG.ogg_path, "notset"); bgMusic->Play(); } menu = MENU_OGG; @@ -5282,6 +5283,7 @@ int MenuOGG() WindowPrompt(LANGUAGE.Notasupportedformat, LANGUAGE.Loadingstandardmusic, LANGUAGE.ok, 0,0,0); sprintf(CFG.ogg_path, "notset"); bgMusic->Play(); + SetVolumeOgg(255*(vol/100.0)); } else { snprintf(CFG.ogg_path, sizeof(CFG.ogg_path), "%s", fullpath); cfg_save_global(); diff --git a/source/oggplayer.c b/source/oggplayer.c index 01221987..38b10af6 100644 --- a/source/oggplayer.c +++ b/source/oggplayer.c @@ -293,6 +293,7 @@ int PlayOgg(int fd, int time_pos, int mode) int PlayOggFromFile(char * path, int loop) { + StopOgg(); u32 filesize = 0; char * bufferogg = NULL; size_t resultogg;