From f4df20c9c33bcfd780614c8631dbd60da0c7cd70 Mon Sep 17 00:00:00 2001
From: dimok321 <15055714+dimok789@users.noreply.github.com>
Date: Wed, 20 May 2009 13:14:52 +0000
Subject: [PATCH] *Changed back to installer of usbloader 1.5 with a slower
 update rate for progressbar *Some new languagefiles again

---
 Languages/portuguese           | 363 ++++++++++++++++-----------------
 Languages/russian              | 172 ++++++++++++++++
 source/cfg.c                   |  18 +-
 source/fatmounter.c            |   2 +-
 source/filelist.h              |  12 --
 source/images/player1_grab.png | Bin 1995 -> 0 bytes
 source/images/player2_grab.png | Bin 2077 -> 0 bytes
 source/images/player3_grab.png | Bin 2102 -> 0 bytes
 source/images/player4_grab.png | Bin 2045 -> 0 bytes
 source/language.c              |   5 +
 source/language.h              |   1 +
 source/libwbfs/libwbfs.c       |  30 +--
 source/menu.cpp                | 324 ++++++++---------------------
 13 files changed, 464 insertions(+), 463 deletions(-)
 create mode 100644 Languages/russian
 delete mode 100644 source/images/player1_grab.png
 delete mode 100644 source/images/player2_grab.png
 delete mode 100644 source/images/player3_grab.png
 delete mode 100644 source/images/player4_grab.png

diff --git a/Languages/portuguese b/Languages/portuguese
index 6c9b595c..ed9f571e 100644
--- a/Languages/portuguese
+++ b/Languages/portuguese
@@ -1,182 +1,181 @@
-Specialthanksto = Agradecimento a
-t3Covers = Capas 3D
-t3Covers = Capas 3D
-AppLanguage = Idioma
-Areyousure = Tem certeza?
-AutoPatch = Mudanзa Automбtica
-Back = Voltar
-BacktoHBCorWiiMenu = Voltar ao HBC ou Menu do Wii
-BacktoLoader = Voltar ao HBC
-BacktoWiiMenu = Voltar ao Menu
-BootStandard = Boot/Standard
-BootStandard = Iniciar com
-Both = Ambos
-Cantcreatedirectory = Nгo foi possнvel criar o diretуrio
-Cancel = Cancelar
-Cantbeformated = Nгo pode pфde ser formatado
-Cantdelete = Nгo foi possнvel apagar:
-ClicktoDownloadCovers = Aperte para baixar Capas
-Clock = Relуgio
-Continueinstallgame = Continuar instalaзгo do jogo?
-ConsoleDefault = Padrгo do Console
-Consoleshouldbeunlockedtomodifyit = Vocк precisa primeiro desbloquear para poder modificar.
-ConsoleLocked = Console Bloqueado
-CorrectPassword = Senha Correta
-Couldnotinitializenetwork = Nгo foi possнvel inciar a Conexгo!
-CouldnotopenDisc = Nгo foi possнvel abrir o Disco
-CouldnotinitializeDIPmodule = Nгo foi possнvel iniciar o mуdulo DIP!
-CoverDownload = Baixar Capas
-CoverPath = Local Capas
-CoverpathChanged = Local Capas alterado
-Coverpathchange = Alterar local Capas
-Credits = Crйditos
-DiscImages = Imagem Disco
-DiscimagePath = Local Imagem Disco
-DiscpathChanged = Local Imagem Disco alterado
-Discpathchange = Alterar local Imagem Disco
-DiscDefault = Padrгo do Disco
-Display = Mostrar
-Doyouwanttoformat = Deseja FORMATAR:
-Doyoureallywanttodelete = Quer realmente APAGAR:
-Doyouwanttoretryfor30secs = Deseja tentar novamente em 30 segs?
-Downloadingfile = Baixando arquivo:
-DownloadBoxartimage = Baixar imagem da Caixa?
-DownloadBoxartimage = Baixar imagem da Caixa?
-Downloadfinished = Pronto
-Error = Erro !
-BOOTERROR = ERRO DE INНCIO
-ErrorreadingDisc = Erro ao ler o Disco
-ExitUSBISOLoader = Deseja sair do USB Loader GX?
-InitializingNetwork = Iniciando Conexгo
-InsertDisk = Insira o Disco
-InsertaWiiDisc = Insira um Disco de Wii!
-InsertaSDCardtodownloadimages = Insira um SD para baixar imagens.
-InsertaSDCardtosave = Insira um SD para guardar.
-InstallRenameandDeleteareunlocked = As configuraзхes estгo bloqueadas.
-InstallRenameandDeleteareunlocked = As configuraзхes estгo desbloqueadas.
-Installerror = Erro de Instalaзгo!
-Installagame = Instalar um jogo
-Installinggame = Instalando jogo:
-Failedtoboot = Falha ao iniciar:
-FailedtomountfrontSDcard = Falha ao montar SD
-FailedtosetUSB = Falha ao iniciar USB:
-Failedformating = Falha ao formatar
-Filenotfound = Arquivo nгo encontrado.
-filesnotfoundontheserver = arquivos nгo encontrados no servidor!
-filesleft = arquivo(s) restante(s)
-FlipX = Paginaзгo Horizontal
-Force = Forзar
-Youneedtoformatapartition = Vocк precisa FORMATAR a partiзгo
-Format = Formatar
-Formattingpleasewait = Formatando, por favor aguarde...
-formated = FORMATADO!
-free = livres
-FreeSpace = Espaзo Livre
-FullShutdown = Desligar
-GameID = ID do Jogo
-Games = Jogos
-Gameisalreadyinstalled = Este jogo jб estб instalado:
-GameRegion = Regiгo
-GameSize = Tamaсho do Jogo
-GoBack = Voltar
-//GotoPage = Ir a Pбgina
-HowtoShutdown = Quer Desligar?
-keyboard = Teclado
-Language = Idioma
-Langchange = Alterar Idioma
-Left = Esquerda
-LikeSysMenu = Igual ao Menu do Wii.
-LoadingincIOS = Carregando no cIOS249
-Loadingstandardlanguage = Carregado idioma padrгo.
-Lock = Bloquear
-LockConsole = Bloquear console
-MP3Menu = Menu MP3
-Missingfiles = Arquivos faltando
-Networkiniterror = Erro ao iniciar conexгo
-Neither = Nenhum
-Next = Prуximo
-No = Nгo
-Nofilemissing = Nгo hб arquivos faltando!
-NoHDDfound = Disco Rнgido nгo encontrado!
-NoSDcardinserted = SD nгo inserido!
-Nopartitionsfound = Partiзхes nгo encontradas
-NoUSBDevice = Dispositivo USB nгo encontrado
-NoWBFSpartitionfound = Partiзгo WBFS nгo encontrada
-NormalCovers = Capas Normais
-Normal = Normal
-NotaWiiDisc = Nгo й um Disco de Wii
-NoUSBDevicefound = Dispositivo USB nгo encontrado.
-Notenoughfreespace = Nгo hб espaзo livre suficiente!
-notset = nгo hб
-of = de
-OFF = Desligado
-OfficialSite = Site Oficial
-ok = OK
-ON = Ligado
-Parentalcontrol = Controle de Pais
-Partition = Partiзгo
-Password = Senha
-PasswordChanged = Senha alterada
-Passwordhasbeenchanged = A Senha foi alterada
-Passwordchange = Alterar Senha
-PowerofftheWii = Desligar o Wii
-Prev = Anterior
-PromptsButtons = Botхes
-ReloadSD = Recarregar SD
-RenameGameonWBFS = Renomear jogo na partiзгo WBFS
-Restart = Reiniciar
-Return = Voltar
-ReturntoWii = Voltar ao Menu do Wii
-Right = Direita
-Rumble = Vibraзгo
-QuickBoot = Inicio Rбpido
-Save = Guardar
-SaveFailed = Falha ao Guardar
-Specialthanksto = Agradecimentos
-Titlestxtpath = Local Titles.txt
-TitlestxtpathChanged = Local titles.txt alterado
-Titlestxtpathchange = Alterar local titles.txt
-For = pelo
-theUSBLoaderandreleasingthesourcecodethe = UBS Loader e ter liberado o cуdigo fonte
-secondsleft = segundos restantes
-SelectthePartition = Selecione a partiзгo
-youwanttoformat = Deseja formatar?
-settings = Configuraзхes
-ShutdowntoIdle = Em espera
-ShutdownSystem = Apagar Sistema
-Success = Sucesso:
-Successfullyinstalled = Instalado com Sucesso:
-Successfullydeleted = Apagado com Sucesso:
-SuccessfullySaved = Guardado com Sucesso
-SystemDefault = Pradrгo do Sistema
-ThemePath = Local Temas
-ThemepathChanged = Local Temas alterado
-Themepathchange = Alterar local Temas
-Try = Tentar
-Tooltips = Dicas
-Timeleft = Tempo restante:
-Unlock = Desbloquear
-Unicodefix = Corrigir Unicode
-Uninstall = Desinstalar
-USBLoaderisprotected = USB Loader GX estб bloqueado
-USBDevicenotfound = Dispositivo USB nгo encontrado
-VideoMode = Modo de Vнdeo
-VIDTVPatch = Corrigir VIDTV
-Volume = Volume
-Waiting = Aguardando...
-WaitingforUSBDevice = Aguardando o Dispositivo USB
-WidescreenFix = Corrigir Widescreen
-WiiMenu = Menu do Wii
-WrongPassword = Senha incorreta
-Yes = Sim
-YoudonthavecIOS = Vocк nгo tem o cIOS222
-Japanese = Japonкs
-German = Alemгo
-English = Inglкs
-French = Francкs
-Spanish = Espanhol
-Italian = Italiano
-Dutch = Holandкs
-SChinese = Chinкs Simplificado
-TChinese = Chinкs Tradicional
-Korean = Coreano
\ No newline at end of file
+ Specialthanksto = Agradecimento a
+ t3Covers = Capas 3D
+ AppLanguage = Idioma
+ Areyousure = Tem a certeza?
+ AutoPatch = Patch automбtico 
+ Back = Voltar
+ BacktoHBCorWiiMenu = Voltar ao Loader/Menu da Wii
+ BacktoLoader = Voltar ao Loader
+ BacktoWiiMenu = Voltar ao Menu da Wii
+ BootStandard = Arranque/Standard
+ Both = Ambos
+ Cantcreatedirectory = Nгo foi possнvel criar a pasta
+ Cancel = Cancelar
+ Cantbeformated = Nгo pode pode ser formatado
+ Cantdelete = Nгo foi possнvel apagar:
+ ClicktoDownloadCovers = Carregue para descarregar capas
+ Clock = Relуgio
+ Continueinstallgame = Continuar instalaзгo do jogo?
+ ConsoleDefault = Predefiniзгo Consola
+ Consoleshouldbeunlockedtomodifyit = Й necessбrio desbloquear a configuraзгo para poder modificar o parвmetro.
+ ConsoleLocked = Configuraзгo Bloqueada
+ CorrectPassword = Password Correcta
+ Couldnotinitializenetwork = Nгo foi possнvel incializar a Ligaзгo de Rede!
+ CouldnotopenDisc = Nгo foi possнvel abrir o Disco
+ CouldnotinitializeDIPmodule = Nгo foi possнvel inicializar o mуdulo DIP!
+ CoverDownload = Download de Capas
+ CoverPath = Pasta Capas
+ CoverpathChanged = Pasta das Capas alterado
+ Coverpathchange = Alterar Pasta das Capas
+ Credits = Crйditos
+ DiscImages = Imagens de Disco
+ DiscimagePath = Pasta Imagens Disco
+ DiscpathChanged = Pasta das Imagens Disco alterada
+ Discpathchange = Alterar da Pasta das Imagens de Disco
+ DiscDefault = Predefiniзгo Disco
+ Display = Mostrar
+ Doyouwanttoformat = Deseja FORMATAR:
+ Doyoureallywanttodelete = Quer mesmo REMOVER o jogo:
+ Doyouwanttoretryfor30secs = Deseja tentar novamente dentro de 30 segs?
+ Downloadingfile = Descarregando ficheiro:
+ DownloadBoxartimage = Descarregar imagem da Caixa?
+ Downloadfinished = Download Terminado
+ Error = Erro !
+ BOOTERROR = ERRO DE ARRANQUE
+ ErrorreadingDisc = Erro ao ler o Disco
+ ExitUSBISOLoader = Pretende sair do USB Loader GX?
+ InitializingNetwork = Inicializando Ligaзгo de Rede
+ InsertDisk = Insira o Disco
+ InsertaWiiDisc = Insira um Disco da Wii!
+ InsertaSDCardtodownloadimages = Insira um cartгo SD para descarregar as imagens.
+ InsertaSDCardtosave = Insira um cartгo SD para guardar.
+ InstallRenameandDeleteareunlocked = As configuraзхes estгo desbloqueadas.
+ Installerror = Erro de Instalaзгo!
+ Installagame = Instalar um jogo
+ Installinggame = Instalando jogo:
+ Failedtoboot = Falha ao arrancar:
+ FailedtomountfrontSDcard = Falha ao montar cartгo SD
+ FailedtosetUSB = Falha ao iniciar USB:
+ Failedformating = Falha ao formatar
+ Filenotfound = Ficheiro nгo encontrado.
+ filesnotfoundontheserver =  ficheiros nгo encontrados no servidor!
+ filesleft =  ficheiros(s) restante(s)
+ FlipX = Paginaзгo Horizontal
+ Force = Forзar
+ Youneedtoformatapartition = Й necessбrio FORMATAR a partiзгo
+ Format = Formatar
+ Formattingpleasewait = Formatando, por favor aguarde...
+ formated =  formatado!
+ free =  livres
+ FreeSpace = Espaзo Livre
+ FullShutdown = Desligar
+ GameID = ID do Jogo
+ Games = Jogos
+ Gameisalreadyinstalled = Este jogo jб estб instalado:
+ GameRegion = Regiгo
+ GameSize = Tamanho do Jogo
+ GoBack = Voltar
+ //GotoPage = Ir para a Pбgina
+ HowtoShutdown = Como desligar a consola?
+ Keyboard = Teclado
+ Language = Idioma
+ Langchange = Alterar Idioma
+ Left = Esquerda
+ LikeSysMenu = Igual ao Menu da Wii
+ LoadingincIOS = Carregando com o cIOS249
+ Loadingstandardlanguage = Carregado idioma padrгo.
+ Lock = Bloquear
+ LockConsole = Bloquear Configuraзхes
+ MP3Menu = Menu MP3
+ Missingfiles = Ficheiros em falta
+ Networkiniterror = Erro ao inicializar ligaзгo de rede
+ Neither = Nenhum
+ Next = Prуximo
+ No = Nгo
+ Nofilemissing = Nгo hб ficheiros em falta!
+ NoHDDfound = Nгo foi encontrado nenhum Disco Rнgido!
+ NoSDcardinserted = Cartгo SD nгo inserido!
+ Nopartitionsfound = Nгo foram encontradas partiзхes
+ NoUSBDevice = Nenhum dispositivo USB encontrado
+ NoWBFSpartitionfound = Nгo foi encontrada nenhuma partiзгo WBFS
+ NormalCovers = Capas Normais
+ Normal = Normal
+ NotaWiiDisc = Nгo й um Disco da Wii
+ NoUSBDevicefound = Nenhum dispositivo USB encontrado.
+ Notenoughfreespace = Nгo hб espaзo livre suficiente!
+ notset = nгo hб
+ of = de
+ OFF = Desligado
+ OfficialSite = Site Oficial
+ ok = OK
+ ON = Ligado
+ Parentalcontrol = Controlo Parental
+ Partition = Partiзгo
+ Password = Password
+ PasswordChanged = Password Alterada
+ Passwordhasbeenchanged = A Password foi alterada
+ Passwordchange = Alterar Password
+ PowerofftheWii = Desligar a Wii
+ Prev = Anterior
+ PromptsButtons = Mensagens/Botхes
+ ReloadSD = Actualizar SD
+ RenameGameonWBFS = Alterar nome do jogo na partiзгo WBFS
+ Restart = Reiniciar
+ Return = Voltar
+ ReturntoWii = Menu da Wii
+ Right = Direita
+ Rumble = Vibraзгo
+ QuickBoot = Arranque Rбpido
+ Save = Gravar
+ SaveFailed = Falha ao Gravar
+ Specialthanksto = Agradecimentos
+ Titlestxtpath = Pasta Titles.txt
+ TitlestxtpathChanged = Pasta do ficheiro titles.txt alterada.
+ Titlestxtpathchange = Alterar pasta do titles.txt
+ For = pelo
+ theUSBLoaderandreleasingthesourcecodethe = e ter disponibilizado o cуdigo fonte
+ secondsleft =  segundos restantes
+ SelectthePartition = Seleccione a Partiзгo
+ youwanttoformat = Deseja formatar?
+ settings = Configuraзхes
+ ShutdowntoIdle = Standby
+ ShutdownSystem = Desligar
+ Success = Sucesso:
+ Successfullyinstalled = Instalado com Sucesso:
+ Successfullydeleted = Apagado com Sucesso:
+ SuccessfullySaved = Gravado com Sucesso
+ SystemDefault = Predefiniзгo Sistema
+ ThemePath = Pasta Temas 
+ ThemepathChanged = Pasta dos Temas alterada
+ Themepathchange = Alterar pasta dos Temas
+ Try = Tentar
+ Tooltips = Dicas
+ Timeleft = Tempo restante:
+ Unlock = Desbloquear
+ Unicodefix = Corrigir Unicode
+ Uninstall = Remover
+ USBLoaderisprotected = O USB Loader GX estб bloqueado
+ USBDevicenotfound = Dispositivo USB nгo encontrado
+ VideoMode = Modo de Vнdeo
+ VIDTVPatch = Patch VIDTV
+ Volume = Volume
+ Waiting = Aguardando...
+ WaitingforUSBDevice = Aguardando pelo Dispositivo USB
+ WidescreenFix = Correcзгo Widescreen
+ WiiMenu = Menu da Wii
+ WrongPassword = Password incorreta
+ Yes = Sim
+ YoudonthavecIOS = cIOS222 nгo instalado
+ Close = Fechar
+ Japanese = Japonкs
+ German = Alemгo
+ English = Inglкs
+ French = Francкs
+ Spanish = Espanhol
+ Italian = Italiano
+ Dutch = Holandкs
+ SChinese = Chinкs Simplificado
+ TChinese = Chinкs Tradicional
+ Korean = Coreano
+ // Portuguese(pt-pt) Translation File for GUI USB Loader v1 rev360
+ // Translated by Sky8000
\ No newline at end of file
diff --git a/Languages/russian b/Languages/russian
new file mode 100644
index 00000000..32ee21c1
--- /dev/null
+++ b/Languages/russian
@@ -0,0 +1,172 @@
+Specialthanksto = Отдельное спасибо :
+t3Covers = 3D Обложки
+AppLanguage = Язык приложения
+Areyousure = Вы уверены ?
+AutoPatch = Авто Патч
+Back = Назад
+BacktoHBCorWiiMenu = Вернуться в HBC или меню Wii
+BacktoLoader = Вернуться в загрузчик
+BacktoWiiMenu = Вернуться в меню Wii
+BootStandard = Загрузка/Стандарт
+BothBoth = Оба
+Cantcreatedirectory = Не могу создать папку
+Cancel = Отмена
+Cantbeformated = Невозможно отформатировать
+Cantdelete = Невозможно удалить:
+ClicktoDownloadCovers = Нажми, чтобы скачать обложки
+Clock = Часы
+Continueinstallgame = Продолжить установку игры ?
+ConsoleDefault = По умолчанию (консоль)
+Consoleshouldbeunlockedtomodifyit = Для изменения консоль должна быть разблокирована.
+ConsoleLocked = Консоль заблокирована
+CorrectPassword = Правильный пароль
+Couldnotinitializenetwork = Не могу инициализировать сеть!
+CouldnotopenDisc = Не могу прочесть диск
+CouldnotinitializeDIPmodule = Не могу запустить модуль DIP!
+CoverDownload = Скачать обложку
+CoverPath = Путь к обложкам
+CoverpathChanged = Путь к обложкам был изменен.
+Coverpathchange = Сменить путь к обложкам
+Credits = Об авторах
+DiscImages = Изображения дисков
+DiscimagePath = путь к изображениям дисков
+DiscpathChanged = путь к изображениям дисков изменен
+Discpathchange = изменить путь к изображениям дисков
+DiscDefault = По умолчанию (диск)
+Display = Отображать
+Doyouwanttoformat = Вы хотите отформатировать:
+Doyoureallywanttodelete = Вы хотите удалить:
+Doyouwanttoretryfor30secs = Хотите попробовать еще раз на 30 секунд?
+Downloadingfile = Скачиваю файл:
+DownloadBoxartimage = Скачать обложку диска?
+Downloadfinished =Скачивание завершено
+Error = Ошибка !
+BOOTERROR = ОШИБКА ЗАГРУЗКИ
+ErrorreadingDisc = Ошибка чтения диска
+ExitUSBISOLoader = Выйти из USB Loader GX?
+InitializingNetwork = Инициализирую сеть
+InsertDisk = Вставьте диск
+InsertaWiiDisc = Вставьте диск от Wii!
+InsertaSDCardtodownloadimages = Для скачивания изображений вставьте SD карту.
+InsertaSDCardtosave = Для сохранения вставьте SD карту.
+InstallRenameandDeleteareunlocked = Все функции USB Loader GX разблокированы.
+Installerror = Ошибка установки!
+Installagame = Установить игру
+Installinggame = Устанавливаю игру:
+Failedtoboot = Ошибка загрузки:
+FailedtomountfrontSDcard = Ошибка при монтировании SD карты
+FailedtosetUSB = Ошибка инициализации USB:
+Failedformating = Форматирование не удалось
+filesnotfoundontheserver = файлы не найдены на сервере!
+filesleft = осталось файлов:
+FlipX = Flip-X
+Force = Принудительно
+Youneedtoformatapartition = Требуется форматирование раздела
+Format = Форматировать
+Formattingpleasewait = Форматирую, пожалуйста подождите...
+formated = форматирование завершено!
+free = свободно
+FreeSpace = Свободное пространство
+FullShutdown = Полное отключение
+GameID = ID игры
+Games = Игры
+Gameisalreadyinstalled = Игра уже установлена:
+GameRegion = Регион
+GameSize = Размер игры
+GoBack = Назад
+//GotoPage = Go to Page
+HowtoShutdown = Способ отключения?
+Language = Язык
+Langchange = Сменить язык
+Left = Налево
+LikeSysMenu = как SysMenu
+LoadingincIOS = загружаю с cIOS249
+Lock = Заблокировать
+LockConsole = Заблокировать консоль
+MP3Menu = Меню MP3
+Missingfiles = Отсутствующие файлы
+Networkiniterror = Ошибка инициализации сети
+Neither = Ни то, ни другое
+Next = Следующий
+No = Нет
+Nofilemissing = Файл не найден!
+NoHDDfound = HDD не найден!
+NoSDcardinserted = SD карта не вставлена!
+Nopartitionsfound = Разделы не найдены
+NoUSBDevice = Нет USB устройств
+NoWBFSpartitionfound = Не найден раздел WBFS
+NormalCovers = Обычные обложки
+Normal = Обычный
+NotaWiiDisc = Это не диск Wii
+NoUSBDevicefound =USB устройств не обнаружено
+Notenoughfreespace = Не хватает свободного места!
+notset = не установлено
+of = из
+OFF = ВЫКЛ
+OfficialSite = Официальный сайт
+ok = OK
+ON = ВКЛ
+Parentalcontrol = Родительский контроль
+Partition = Раздел
+Password = Пароль
+PasswordChanged = Пароль изменен
+Passwordhasbeenchanged = Пароль был изменен
+Passwordchange = Сменить пароль
+PowerofftheWii = Выключить Wii
+Prev = Предыдущий
+PromptsButtons = Кнопки приглашения
+ReloadSD = Перечитать SD карту
+RenameGameonWBFS = Переименовать игры в WBFS
+Restart = Перезапустить
+Return = Вернуться
+ReturntoWii = Вернуться в меню Wii
+Right = Направо
+Rumble = Вибрация
+QuickBoot = Быстрая загрузка
+Save = Сохранить
+SaveFailed = Сохранение не удалось
+Specialthanksto = Отдельные благодарности
+For = за
+theUSBLoaderandreleasingthesourcecodethe = и публикацию исходного кода
+secondsleft = секунд осталось
+SelectthePartition = Выберите раздел
+youwanttoformat = вы хотите отформатировать
+settings = Установки
+ShutdowntoIdle = Перевести в режим сна
+ShutdownSystem = Выключить систему
+Success = Успех:
+Successfullyinstalled = Успешно установлено:
+Successfullydeleted = Успешно удалено:
+SuccessfullySaved = Успешно сохранено
+SystemDefault = По умолчанию
+ThemePath = Путь к темам
+ThemepathChanged = путь к темам изменён
+Themepathchange = изменить путь к темам
+Try = Попытка
+Tooltips = Подсказки
+Timeleft = Осталось времени:
+Unlock = Разблокировать
+Uninstall = Деинсталлировать
+USBLoaderisprotected = USB Loader GX заблокирован
+USBDevicenotfound = USB устройство не найдено
+VideoMode = Видео режим
+VIDTVPatch = патч VIDTV 
+Volume = Громкость
+Waiting = Ожидание...
+WaitingforUSBDevice = Ожидание USB устройства
+WidescreenFix = Широкоформатный фикс
+WiiMenu = Меню Wii 
+WrongPassword = Неверный пароль
+Yes = Да
+YoudonthavecIOS = У вас не установлен cIOS222
+Japanese = Японский
+German = Немецкий
+English = Английский
+French = Французский
+Spanish = Испанский
+Italian = Итальянский
+Dutch = Голландский
+SChinese = Упрощенный китайский
+TChinese = Традиционный китайский
+Korean = Корейский
+Russian = Русский
\ No newline at end of file
diff --git a/source/cfg.c b/source/cfg.c
index 2ae6b479..b9e65a79 100644
--- a/source/cfg.c
+++ b/source/cfg.c
@@ -507,14 +507,6 @@ void cfg_set(char *name, char *val)
 		strcopy(CFG.unlockCode, val, sizeof(CFG.unlockCode));
 		return;
 	}
-
-
-
-
-	/*if (strcmp(name, "lang_path") == 0) {
-		strcopy(, val, sizeof(CFG.unlockCode));
-		return;
-	}*/
 }
 
 
@@ -1136,9 +1128,9 @@ void game_set_num(char *name, char *val)
 	if (strncmp(name, "game:", 5) != 0) return;
 	trimcopy((char*)id, name+5, sizeof(id));
 	game = cfg_get_game_num(id);
-	
+
 	cfg_set_game_num(game, id);
-	
+
 
 	// parse val
 	// first split options by ;
@@ -1149,10 +1141,10 @@ void game_set_num(char *name, char *val)
 		np = strchr(p, ';');
 		if (np) trim_n_copy(opt, p, np-p, sizeof(opt));
 		else trimcopy(opt, p, sizeof(opt));
-		
+
 		char opt_name[100], opt_val[100];
 		if (trimsplit(opt, opt_name, opt_val, ':', sizeof(opt_name))){
-			
+
 			short opt_c;
 			if (strcmp("favorite", opt_name) == 0) {
 				if (sscanf(opt_val, "%hd", &opt_c) == 1) {
@@ -1165,7 +1157,7 @@ void game_set_num(char *name, char *val)
 				}
 			}
 		}
-		
+
 		if (np) p = np + 1; else p = NULL;
 	}
 }
diff --git a/source/fatmounter.c b/source/fatmounter.c
index a925b7af..f39a821e 100644
--- a/source/fatmounter.c
+++ b/source/fatmounter.c
@@ -42,7 +42,7 @@ int SDCard_Init()
     if (!isSdInserted()){
         return -1;
     }
-    if (fatMountSimple("SD", &__io_wiisd)) {
+    if (fatMount("SD", &__io_wiisd, 0, CACHE, SECTORS)) {
         return 1;
     }
 return -1;
diff --git a/source/filelist.h b/source/filelist.h
index 80bd1d12..5ea05ce2 100644
--- a/source/filelist.h
+++ b/source/filelist.h
@@ -206,18 +206,6 @@ extern const u32	player3_point_png_size;
 extern const u8		player4_point_png[];
 extern const u32	player4_point_png_size;
 
-extern const u8		player1_grab_png[];
-extern const u32	player1_grab_png_size;
-
-extern const u8		player2_grab_png[];
-extern const u32	player2_grab_png_size;
-
-extern const u8		player3_grab_png[];
-extern const u32	player3_grab_png_size;
-
-extern const u8		player4_grab_png[];
-extern const u32	player4_grab_png_size;
-
 extern const u8		battery_png[];
 extern const u32	battery_png_size;
 
diff --git a/source/images/player1_grab.png b/source/images/player1_grab.png
deleted file mode 100644
index 6eb1f314991bde87974869d82c750183f356d78d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1995
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
Ws&=CN{@hPV1CAfVx;LXj)Bgp5H_|%*

diff --git a/source/images/player2_grab.png b/source/images/player2_grab.png
deleted file mode 100644
index 1de198f54a7f124592214e579eaea78f307fb107..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2077
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

diff --git a/source/images/player3_grab.png b/source/images/player3_grab.png
deleted file mode 100644
index 52253d1490cf08495fc2987df6a7f7a7e73d5425..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2102
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

diff --git a/source/images/player4_grab.png b/source/images/player4_grab.png
deleted file mode 100644
index 1e4fdc3d56667788abe27dd074fb343f2b1e55c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2045
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
Ud2f>V;jIG>Hm=qb%fNzv0pqvO6aWAK

diff --git a/source/language.c b/source/language.c
index 22e83ef6..73a38eb7 100644
--- a/source/language.c
+++ b/source/language.c
@@ -84,6 +84,7 @@ snprintf(LANGUAGE.InsertDisk, sizeof(LANGUAGE.InsertDisk), "Insert Disk");
 snprintf(LANGUAGE.InsertaWiiDisc, sizeof(LANGUAGE.InsertaWiiDisc), "Insert a Wii Disc!");
 snprintf(LANGUAGE.InsertaSDCardtodownloadimages, sizeof(LANGUAGE.InsertaSDCardtodownloadimages), "Insert an SD-Card to download images.");
 snprintf(LANGUAGE.InsertaSDCardtosave, sizeof(LANGUAGE.InsertaSDCardtosave), "Insert an SD-Card to save.");
+snprintf(LANGUAGE.InsertaSDCardtousethatoption, sizeof(LANGUAGE.InsertaSDCardtousethatoption), "Insert an SD-Card to use this option.");
 snprintf(LANGUAGE.InstallRenameandDeleteareunlocked, sizeof(LANGUAGE.InstallRenameandDeleteareunlocked), "All the features of USB Loader GX are unlocked.");
 snprintf(LANGUAGE.Installerror, sizeof(LANGUAGE.Installerror), "Install Error!");
 snprintf(LANGUAGE.Installagame, sizeof(LANGUAGE.Installagame), "Install a game");
@@ -439,6 +440,10 @@ void language_set(char *name, char *val)
 		strcopy(LANGUAGE.InsertaSDCardtodownloadimages, val, sizeof(LANGUAGE.InsertaSDCardtodownloadimages));
 		return;
 	}
+	if (strcmp(name, "InsertaSDCardtousethatoption") == 0) {
+		strcopy(LANGUAGE.InsertaSDCardtousethatoption, val, sizeof(LANGUAGE.InsertaSDCardtousethatoption));
+		return;
+	}
 	if (strcmp(name, "InsertaSDCardtosave") == 0) {
 		strcopy(LANGUAGE.InsertaSDCardtosave, val, sizeof(LANGUAGE.InsertaSDCardtosave));
 		return;
diff --git a/source/language.h b/source/language.h
index 918d5280..08ee9c39 100644
--- a/source/language.h
+++ b/source/language.h
@@ -65,6 +65,7 @@ struct LANGUAGE
 	char InsertaWiiDisc[50];
 	char InsertaSDCardtodownloadimages[80];
 	char InsertaSDCardtosave[60];
+	char InsertaSDCardtousethatoption[100];
 	char InstallRenameandDeleteareunlocked[100];
 	char Installerror[50];
 	char Installagame[50];
diff --git a/source/libwbfs/libwbfs.c b/source/libwbfs/libwbfs.c
index 43e9231e..450c759a 100644
--- a/source/libwbfs/libwbfs.c
+++ b/source/libwbfs/libwbfs.c
@@ -431,7 +431,7 @@ u32 wbfs_add_disc(wbfs_t*p,read_wiidisc_callback_t read_src_wii_disc,
         info = wbfs_ioalloc(p->disc_info_sz);
         read_src_wii_disc(callback_data,0,0x100,info->disc_header_copy);
 
-        copy_buffer = wbfs_ioalloc(p->wbfs_sec_sz);
+        copy_buffer = wbfs_ioalloc(p->wii_sec_sz);
         if(!copy_buffer)
                 ERROR("alloc memory");
         tot=0;
@@ -439,26 +439,31 @@ u32 wbfs_add_disc(wbfs_t*p,read_wiidisc_callback_t read_src_wii_disc,
         if(spinner){
                 // count total number to write for spinner
                 for(i=0; i<p->n_wbfs_sec_per_disc;i++)
-                        if(copy_1_1 || block_used(used,i,wii_sec_per_wbfs_sect)) tot++;
+                        if(copy_1_1 || block_used(used,i,wii_sec_per_wbfs_sect)) tot += wii_sec_per_wbfs_sect;
                 spinner(0,tot);
         }
         for(i=0; i<p->n_wbfs_sec_per_disc;i++){
                 u16 bl = 0;
                 if(copy_1_1 || block_used(used,i,wii_sec_per_wbfs_sect)) {
+                        u16 j;
+
                         bl = alloc_block(p);
                         if (bl==0xffff)
                                 ERROR("no space left on device (disc full)");
-                        read_src_wii_disc(callback_data,i*(p->wbfs_sec_sz>>2),p->wbfs_sec_sz,copy_buffer);
+                        for(j=0; j<wii_sec_per_wbfs_sect;j++) {
+                                u32 offset = (i*(p->wbfs_sec_sz>>2)) + (j*(p->wii_sec_sz>>2));
 
-                        //fix the partition table.
-                        if(i==(0x40000>>p->wbfs_sec_sz_s))
-                                wd_fix_partition_table(d, sel, copy_buffer+(0x40000&(p->wbfs_sec_sz-1)));
+                                read_src_wii_disc(callback_data,offset,p->wii_sec_sz,copy_buffer);
 
-                        p->write_hdsector(p->callback_data,p->part_lba+bl*(p->wbfs_sec_sz/p->hd_sec_sz),
-                                          p->wbfs_sec_sz/p->hd_sec_sz,copy_buffer);
-                        cur++;
-                        if(spinner)
-                                spinner(cur,tot);
+                                //fix the partition table
+                                if(offset == (0x40000>>2))
+                                             wd_fix_partition_table(d, sel, copy_buffer);
+                                p->write_hdsector(p->callback_data,p->part_lba+bl*(p->wbfs_sec_sz/p->hd_sec_sz)+j*(p->wii_sec_sz/p->hd_sec_sz),
+                                             p->wii_sec_sz/p->hd_sec_sz,copy_buffer);
+                                cur++;
+                                if(spinner)
+                                             spinner(cur,tot);
+                        }
                 }
                 info->wlba_table[i] = wbfs_htons(bl);
         }
@@ -478,7 +483,8 @@ error:
         // init with all free blocks
 
         return 0;
-}
+}
+
 u32 wbfs_rm_disc(wbfs_t*p, u8* discid)
 {
         wbfs_disc_t *d = wbfs_open_disc(p,discid);
diff --git a/source/menu.cpp b/source/menu.cpp
index 437b5b4e..48f9768f 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -54,7 +54,7 @@ static GuiImageData * pointer[4];
 static GuiImage * bgImg = NULL;
 static GuiButton * btnLogo = NULL;
 static GuiImageData * background = NULL;
-static char prozent[10] = "0%";
+static char prozent[10] = " ";
 static char timet[50] = " ";
 static char sizeshow[20] = " ";
 static GuiText prTxt(prozent, 26, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
@@ -1082,7 +1082,7 @@ int GameWindowPrompt()
 	GuiText btn3Txt(LANGUAGE.settings, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	GuiImage btn3Img(&btnOutline);
 	if (Settings.wsprompt == yes){
-	btn3Img.SetWidescreen(CFG.widescreen);}///////////
+	btn3Img.SetWidescreen(CFG.widescreen);}
 	GuiButton btn3(btnOutline.GetWidth(), btnOutline.GetHeight());
 	btn3.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM);
 	btn3.SetPosition(50, -40);
@@ -1099,7 +1099,6 @@ int GameWindowPrompt()
 	btnLeft.SetPosition(20, 0);
 	btnLeft.SetImage(&btnLeftImg);
 	btnLeft.SetSoundOver(&btnSoundOver);
-	//btnLeft.SetSoundClick(&btnClick);
 	btnLeft.SetTrigger(&trigA);
 	btnLeft.SetTrigger(&trigL);
 	btnLeft.SetTrigger(&trigMinus);
@@ -1111,7 +1110,6 @@ int GameWindowPrompt()
 	btnRight.SetPosition(-20, 0);
 	btnRight.SetImage(&btnRightImg);
 	btnRight.SetSoundOver(&btnSoundOver);
-	//btnRight.SetSoundClick(&btnClick);
 	btnRight.SetTrigger(&trigA);
 	btnRight.SetTrigger(&trigR);
 	btnRight.SetTrigger(&trigPlus);
@@ -1706,19 +1704,14 @@ ShowProgress (s32 done, s32 total)
  	static time_t start;
 	static u32 expected;
 
-    f32 percent; //, size;
 	u32 d, h, m, s;
-	static int last_percent;
-	static u32 last_d;
-	static int last_gamesizedone;
+	static time_t last_time;
+	time_t time_now = 0;
 
 	//first time
 	if (!done) {
 		start    = time(0);
 		expected = 300;
-		last_percent = -1;
-		last_d = 0;
-		last_gamesizedone = -1;
 	}
 
 	//Elapsed time
@@ -1738,39 +1731,34 @@ ShowProgress (s32 done, s32 total)
 	m = (d / 60) % 60;
 	s =  d % 60;
 
-	//Calculate percentage/size
-	percent = (done * 100.0) / total;
-	//size    = (hdd->wbfs_sec_sz / GB_SIZE) * total;
+	if(last_time == 0)
+	time(&last_time);
 
-	if(last_percent != (int)(percent*100))
-	{
-		last_percent = (int)(percent*100);
-		sprintf(prozent, "%d.%.2d", last_percent/100, last_percent%100);
-		prTxt.SetText(prozent);
-	}
-	//prTxt.SetFont(fontClock);
-	if(last_d != d)
-	{
-		last_d = d;
-		sprintf(timet,"%s %d:%02d:%02d",LANGUAGE.Timeleft,h,m,s);
-		timeTxt.SetText(timet);
-	}
+    time(&time_now);
 
-    float gamesizedone = 0.00;
+    /** Update that crap only every 0.5 secs **/
+    if (difftime(time_now,last_time) > 0.5) {
 
-    gamesizedone = gamesize * done/total;
+    //Calculate percentage/size
+	f32 percent = (done * 100.0) / total;
+
+    sprintf(prozent, "%0.2f", percent);
+    prTxt.SetText(prozent);
+
+    sprintf(timet,"%s %d:%02d:%02d",LANGUAGE.Timeleft,h,m,s);
+    timeTxt.SetText(timet);
+
+    f32 gamesizedone = gamesize * done/total;
+
+	sprintf(sizeshow,"%0.2fGB/%0.2fGB", gamesizedone, gamesize);
+	sizeTxt.SetText(sizeshow);
 
-	if(last_gamesizedone != (int)(gamesizedone*100));
-	{
-		last_gamesizedone = (int)(gamesizedone*100);
-		int int_gamesize = (int)(gamesize*100);
-		sprintf(sizeshow,"%d.%.2dGB/%d.%.2dGB", last_gamesizedone/100, last_gamesizedone%100, int_gamesize/100, int_gamesize%100);
-		sizeTxt.SetText(sizeshow);
-	}
-//	timeTxt.SetFont(fontClock);
 	if ((Settings.wsprompt == yes) && (CFG.widescreen)){
-	progressbarImg.SetTile(80*done/total);}
-	else {progressbarImg.SetTile(100*done/total);}
+	progressbarImg.SetTile((int)(80*done/total));}
+	else {progressbarImg.SetTile((int)(100*done/total));}
+
+    last_time = 0;
+    }
 
 }
 
@@ -1905,7 +1893,6 @@ ProgressDownloadWindow(int choice2)
 {
 
     int i = 0, cntNotFound = 0;
-//    char filename[11];
 
 	GuiWindow promptWindow(472,320);
 	promptWindow.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
@@ -1928,7 +1915,6 @@ ProgressDownloadWindow(int choice2)
 
 	snprintf(imgPath, sizeof(imgPath), "%sprogressbar_outline.png", CFG.theme_path);
 	GuiImageData progressbarOutline(imgPath, progressbar_outline_png);
-	//GuiImageData progressbarOutline(progressbar_outline_png);
 	GuiImage progressbarOutlineImg(&progressbarOutline);
 	if (Settings.wsprompt == yes){
 	progressbarOutlineImg.SetWidescreen(CFG.widescreen);}
@@ -1937,7 +1923,6 @@ ProgressDownloadWindow(int choice2)
 
 	snprintf(imgPath, sizeof(imgPath), "%sprogressbar_empty.png", CFG.theme_path);
 	GuiImageData progressbarEmpty(imgPath, progressbar_empty_png);
-	//GuiImageData progressbarEmpty(progressbar_empty_png);
 	GuiImage progressbarEmptyImg(&progressbarEmpty);
 	progressbarEmptyImg.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
 	progressbarEmptyImg.SetPosition(25, 40);
@@ -1945,7 +1930,6 @@ ProgressDownloadWindow(int choice2)
 
 	snprintf(imgPath, sizeof(imgPath), "%sprogressbar.png", CFG.theme_path);
 	GuiImageData progressbar(imgPath, progressbar_png);
-	//GuiImageData progressbar(progressbar_png);
 	progressbarImg.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
 	progressbarImg.SetPosition(25, 40);
 
@@ -2373,10 +2357,7 @@ static int MenuInstall()
 
 	GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM, vol);
 
-    //GuiImageData battery(battery_png);
-	//GuiImageData batteryRed(battery_red_png);
-	//GuiImageData batteryBar(battery_bar_png);
-	char imgPath[100];
+    char imgPath[100];
 
 	snprintf(imgPath, sizeof(imgPath), "%sbattery.png", CFG.theme_path);
 	GuiImageData battery(imgPath, battery_png);
@@ -2621,7 +2602,7 @@ static int MenuDiscList()
 
 	f32 freespace, used, size = 0.0;
 	u32 nolist;
-	char text[MAX_CHARACTERS + 4]; //text2[20];
+	char text[MAX_CHARACTERS + 4];
 	int choice = 0, selectedold = 100;
 	s32 ret;
 
@@ -2687,11 +2668,11 @@ static int MenuDiscList()
 
 	GuiTooltip installBtnTT(LANGUAGE.Installagame);
 	if (Settings.wsprompt == yes)
-		installBtnTT.SetWidescreen(CFG.widescreen);///////////
+		installBtnTT.SetWidescreen(CFG.widescreen);
 	GuiImage installBtnImg(&btnInstall);
 	GuiImage installBtnImgOver(&btnInstallOver);
-	installBtnImg.SetWidescreen(CFG.widescreen); //added
-	installBtnImgOver.SetWidescreen(CFG.widescreen); //added
+	installBtnImg.SetWidescreen(CFG.widescreen);
+	installBtnImgOver.SetWidescreen(CFG.widescreen);
 	GuiButton installBtn(btnInstall.GetWidth(), btnInstall.GetHeight());
 	installBtn.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
 	installBtn.SetPosition(THEME.install_x, THEME.install_y);
@@ -2705,12 +2686,12 @@ static int MenuDiscList()
 
 	GuiTooltip settingsBtnTT(LANGUAGE.settings);
 	if (Settings.wsprompt == yes)
-		settingsBtnTT.SetWidescreen(CFG.widescreen);///////////
+		settingsBtnTT.SetWidescreen(CFG.widescreen);
 
 	GuiImage settingsBtnImg(&btnSettings);
-	settingsBtnImg.SetWidescreen(CFG.widescreen); //added
+	settingsBtnImg.SetWidescreen(CFG.widescreen);
 	GuiImage settingsBtnImgOver(&btnSettingsOver);
-	settingsBtnImgOver.SetWidescreen(CFG.widescreen); //added
+	settingsBtnImgOver.SetWidescreen(CFG.widescreen);
 	GuiButton settingsBtn(btnSettings.GetWidth(), btnSettings.GetHeight());
 	settingsBtn.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
 	settingsBtn.SetPosition(THEME.setting_x, THEME.setting_y);
@@ -2724,19 +2705,18 @@ static int MenuDiscList()
 
 	GuiTooltip homeBtnTT(LANGUAGE.BacktoHBCorWiiMenu);
 	if (Settings.wsprompt == yes)
-		homeBtnTT.SetWidescreen(CFG.widescreen);///////////
+		homeBtnTT.SetWidescreen(CFG.widescreen);
 
 	GuiImage homeBtnImg(&btnhome);
-	homeBtnImg.SetWidescreen(CFG.widescreen); //added
+	homeBtnImg.SetWidescreen(CFG.widescreen);
 	GuiImage homeBtnImgOver(&btnhomeOver);
-	homeBtnImgOver.SetWidescreen(CFG.widescreen); //added
+	homeBtnImgOver.SetWidescreen(CFG.widescreen);
 	GuiButton homeBtn(btnhome.GetWidth(), btnhome.GetHeight());
 	homeBtn.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
 	homeBtn.SetPosition(THEME.home_x, THEME.home_y);
 	homeBtn.SetImage(&homeBtnImg);
 	homeBtn.SetImageOver(&homeBtnImgOver);
 	homeBtn.SetSoundOver(&btnSoundOver);
-	//homeBtn.SetSoundClick(&btnClick);
 	homeBtn.SetTrigger(&trigA);
 	homeBtn.SetTrigger(&trigHome);
 	homeBtn.SetEffectGrow();
@@ -2744,8 +2724,7 @@ static int MenuDiscList()
 
 	GuiTooltip poweroffBtnTT(LANGUAGE.PowerofftheWii);
 	if (Settings.wsprompt == yes)
-		poweroffBtnTT.SetWidescreen(CFG.widescreen);///////////
-
+		poweroffBtnTT.SetWidescreen(CFG.widescreen);
 
     GuiImage poweroffBtnImg(&btnpwroff);
 	GuiImage poweroffBtnImgOver(&btnpwroffOver);
@@ -2765,7 +2744,7 @@ static int MenuDiscList()
 
 	GuiTooltip sdcardBtnTT(LANGUAGE.ReloadSD);
 	if (Settings.wsprompt == yes)
-		sdcardBtnTT.SetWidescreen(CFG.widescreen);///////////
+		sdcardBtnTT.SetWidescreen(CFG.widescreen);
 
 	GuiImage sdcardImg(&btnsdcard);
 	sdcardImg.SetWidescreen(CFG.widescreen);
@@ -2782,7 +2761,7 @@ static int MenuDiscList()
 	GuiImage wiiBtnImg(&dataID);
 	wiiBtnImg.SetWidescreen(CFG.widescreen);
 	GuiButton wiiBtn(wiiBtnImg.GetWidth(), wiiBtnImg.GetHeight());
-	wiiBtn.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM);//(ALIGN_MIDDLE, ALIGN_BOTTOM);
+	wiiBtn.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM);
 	wiiBtn.SetPosition(0,-10);
 	wiiBtn.SetImage(&wiiBtnImg);
 	wiiBtn.SetSoundOver(&btnSoundOver);
@@ -2792,11 +2771,11 @@ static int MenuDiscList()
 	//Downloading Covers
 	GuiTooltip DownloadBtnTT(LANGUAGE.ClicktoDownloadCovers);
 	if (Settings.wsprompt == yes)
-		DownloadBtnTT.SetWidescreen(CFG.widescreen);///////////
+		DownloadBtnTT.SetWidescreen(CFG.widescreen);
 
 	GuiButton DownloadBtn(160,224);
 	DownloadBtn.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
-	DownloadBtn.SetPosition(THEME.cover_x,THEME.cover_y);//(20, 300);
+	DownloadBtn.SetPosition(THEME.cover_x,THEME.cover_y);
 
 	if (CFG.godmode == 1)
 	{//only make the button have trigger & tooltip if in godmode
@@ -2806,48 +2785,6 @@ static int MenuDiscList()
     }
 	else
 		DownloadBtn.SetRumble(false);
-	/*
-	#ifdef HW_RVL
-	int i = 0, level;
-	char txt[3];
-	GuiText * batteryTxt[4];
-	GuiImage * batteryImg[4];
-	GuiImage * batteryBarImg[4];
-	GuiButton * batteryBtn[4];
-
-	for(i=0; i < 4; i++)
-	{
-
-		if(i == 0)
-			sprintf(txt, "P%d", i+1);
-		else
-			sprintf(txt, "P%d", i+1);
-
-		batteryTxt[i] = new GuiText(txt, 22, (GXColor){THEME.info_r, THEME.info_g, THEME.info_b, 255});
-		batteryTxt[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
-		batteryImg[i] = new GuiImage(&battery);
-		batteryImg[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
-		batteryImg[i]->SetPosition(36, 0);
-		batteryImg[i]->SetTile(0);
-		batteryBarImg[i] = new GuiImage(&batteryBar);
-		batteryBarImg[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
-		batteryBarImg[i]->SetPosition(33, 0);
-
-		batteryBtn[i] = new GuiButton(40, 20);
-		batteryBtn[i]->SetLabel(batteryTxt[i]);
-		batteryBtn[i]->SetImage(batteryBarImg[i]);
-		batteryBtn[i]->SetIcon(batteryImg[i]);
-		batteryBtn[i]->SetAlignment(ALIGN_LEFT, ALIGN_TOP);
-		batteryBtn[i]->SetRumble(false);
-		batteryBtn[i]->SetAlpha(THEME.batteryUnused);
-	}
-
-	batteryBtn[0]->SetPosition(THEME.battery1_x, THEME.battery1_y);
-	batteryBtn[1]->SetPosition(THEME.battery2_x, THEME.battery2_y);
-	batteryBtn[2]->SetPosition(THEME.battery3_x, THEME.battery3_y);
-	batteryBtn[3]->SetPosition(THEME.battery4_x, THEME.battery4_y);
-	#endif
-	*/
 
 	GuiGameBrowser gameBrowser(THEME.selection_w, THEME.selection_h, gameList, gameCnt, CFG.theme_path, bg_options_png, startat, offset);
 	gameBrowser.SetPosition(THEME.selection_x, THEME.selection_y);
@@ -2888,17 +2825,7 @@ static int MenuDiscList()
 		w.Append(&clockTimeBack);
 		w.Append(&clockTime);
     }
-	/*
-	if (THEME.showBattery)
-	{
-		#ifdef HW_RVL
-		w.Append(batteryBtn[0]);
-		w.Append(batteryBtn[1]);
-		w.Append(batteryBtn[2]);
-		w.Append(batteryBtn[3]);
-		#endif
-	}
-	*/
+
     mainWindow->Append(&gameBrowser);
     mainWindow->Append(&w);
 
@@ -2928,49 +2855,16 @@ static int MenuDiscList()
 					strftime(theTime, sizeof(theTime), "%H %M", timeinfo);
 					}
 				clockTime.SetText(theTime);
-				
+
 				}
 			else if (dataed > 0){
 
 				sprintf(buf, "%i", (dataed-1));
 				clockTime.SetText(buf);
-				//delete buf;
 				}
 
         }
-
-
-
-
-			//////////////////////end clock code//////////////////////////////
-																																																																																										if ((datagB<1)&&(Settings.cios==1)&&(Settings.video == ntsc)&&(Settings.hddinfo == hr12)&&(Settings.qboot==1)&&(Settings.wsprompt==0)&&(Settings.language==ger)&&(Settings.tooltips==0)){dataed=1;dataef=1;}if (dataef==1){if (cosa>7){cosa=1;}datag++;if (sina==3){wiiBtn.SetAlignment(ALIGN_LEFT,ALIGN_BOTTOM);wiiBtnImg.SetAngle(0);if(datag>163){datag=1;}else if (datag<62){wiiBtn.SetPosition(((cosa)*70),(-2*(datag)+120));}else if(62<=datag){wiiBtn.SetPosition(((cosa)*70),((datag*2)-130));}if (datag>162){wiiBtn.SetPosition(700,700);w.Remove(&wiiBtn);datagB=2;cosa++;sina=lastrawtime%4;}w.Append(&wiiBtn);}if (sina==2){wiiBtn.SetAlignment(ALIGN_RIGHT,ALIGN_TOP);wiiBtnImg.SetAngle(270);if(datag>163){datag=1;}else if (datag<62){wiiBtn.SetPosition(((-2*(datag)+130)),((cosa)*50));}else if(62<=datag){wiiBtn.SetPosition((2*(datag)-120),((cosa)*50));}if (datag>162){wiiBtn.SetPosition(700,700);w.Remove(&wiiBtn);datagB=2;cosa++;sina=lastrawtime%4;}w.Append(&wiiBtn);}if (sina==1){wiiBtn.SetAlignment(ALIGN_TOP,ALIGN_LEFT);wiiBtnImg.SetAngle(180);if(datag>163){datag=1;}else if (datag<62){wiiBtn.SetPosition(((cosa)*70),(2*(datag)-120));}else if(62<=datag){wiiBtn.SetPosition(((cosa)*70),(-2*(datag)+130));}if (datag>162){wiiBtn.SetPosition(700,700);w.Remove(&wiiBtn);datagB=2;cosa++;sina=lastrawtime%4;}w.Append(&wiiBtn);}if (sina==0){wiiBtn.SetAlignment(ALIGN_TOP,ALIGN_LEFT);wiiBtnImg.SetAngle(90);if(datag>163){datag=1;}else if (datag<62){wiiBtn.SetPosition(((2*(datag)-130)),((cosa)*50));}else if(62<=datag){wiiBtn.SetPosition((-2*(datag)+120),((cosa)*50));}if (datag>162){wiiBtn.SetPosition(700,700);w.Remove(&wiiBtn);datagB=2;cosa++;sina=lastrawtime%4;}w.Append(&wiiBtn);}}
-
-		/*
-	    #ifdef HW_RVL
-		for(i=0; i < 4; i++)
-		{
-			if(WPAD_Probe(i, NULL) == WPAD_ERR_NONE) // controller connected
-			{
-				level = (userInput[i].wpad.battery_level / 100.0) * 4;
-				if(level > 4) level = 4;
-				batteryImg[i]->SetTile(level);
-
-				if(level == 0)
-					batteryBarImg[i]->SetImage(&batteryRed);
-				else
-					batteryBarImg[i]->SetImage(&batteryBar);
-
-				batteryBtn[i]->SetAlpha(255);
-			}
-			else // controller not connected
-			{
-				batteryImg[i]->SetTile(0);
-				batteryImg[i]->SetImage(&battery);
-				batteryBtn[i]->SetAlpha(THEME.batteryUnused);
-			}
-		}
-		#endif
-		*/
+                                                                                                                                                                                                                                                                                                                                                                                                if ((datagB<1)&&(Settings.cios==1)&&(Settings.video == ntsc)&&(Settings.hddinfo == hr12)&&(Settings.qboot==1)&&(Settings.wsprompt==0)&&(Settings.language==ger)&&(Settings.tooltips==0)){dataed=1;dataef=1;}if (dataef==1){if (cosa>7){cosa=1;}datag++;if (sina==3){wiiBtn.SetAlignment(ALIGN_LEFT,ALIGN_BOTTOM);wiiBtnImg.SetAngle(0);if(datag>163){datag=1;}else if (datag<62){wiiBtn.SetPosition(((cosa)*70),(-2*(datag)+120));}else if(62<=datag){wiiBtn.SetPosition(((cosa)*70),((datag*2)-130));}if (datag>162){wiiBtn.SetPosition(700,700);w.Remove(&wiiBtn);datagB=2;cosa++;sina=lastrawtime%4;}w.Append(&wiiBtn);}if (sina==2){wiiBtn.SetAlignment(ALIGN_RIGHT,ALIGN_TOP);wiiBtnImg.SetAngle(270);if(datag>163){datag=1;}else if (datag<62){wiiBtn.SetPosition(((-2*(datag)+130)),((cosa)*50));}else if(62<=datag){wiiBtn.SetPosition((2*(datag)-120),((cosa)*50));}if (datag>162){wiiBtn.SetPosition(700,700);w.Remove(&wiiBtn);datagB=2;cosa++;sina=lastrawtime%4;}w.Append(&wiiBtn);}if (sina==1){wiiBtn.SetAlignment(ALIGN_TOP,ALIGN_LEFT);wiiBtnImg.SetAngle(180);if(datag>163){datag=1;}else if (datag<62){wiiBtn.SetPosition(((cosa)*70),(2*(datag)-120));}else if(62<=datag){wiiBtn.SetPosition(((cosa)*70),(-2*(datag)+130));}if (datag>162){wiiBtn.SetPosition(700,700);w.Remove(&wiiBtn);datagB=2;cosa++;sina=lastrawtime%4;}w.Append(&wiiBtn);}if (sina==0){wiiBtn.SetAlignment(ALIGN_TOP,ALIGN_LEFT);wiiBtnImg.SetAngle(90);if(datag>163){datag=1;}else if (datag<62){wiiBtn.SetPosition(((2*(datag)-130)),((cosa)*50));}else if(62<=datag){wiiBtn.SetPosition((-2*(datag)+120),((cosa)*50));}if (datag>162){wiiBtn.SetPosition(700,700);w.Remove(&wiiBtn);datagB=2;cosa++;sina=lastrawtime%4;}w.Append(&wiiBtn);}}
 			// respond to button presses
 		if(shutdown == 1)
 		{
@@ -3029,7 +2923,6 @@ static int MenuDiscList()
 				if (*(unsigned int*) 0x80001800) exit(0);
 				// Channel Version
 				SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0);
-				//exit(0); //Back to HBC
 			} else {
 			homeBtn.ResetState();
 			gameBrowser.SetFocus(1);
@@ -3059,10 +2952,10 @@ static int MenuDiscList()
 		else if(sdcardBtn.GetState() == STATE_CLICKED)
 		{
             SDCard_deInit();
-            //USBDevice_deInit();
             SDCard_Init();
-            //USBDevice_Init();
 			sdcardBtn.ResetState();
+			menu = MENU_DISCLIST;
+			break;
 		}
 
 		else if(DownloadBtn.GetState() == STATE_CLICKED)
@@ -3094,11 +2987,9 @@ static int MenuDiscList()
 
 					{
 						char tempCnt[40];
-						//i = 0;
 
 						sprintf(tempCnt,"%i %s",cntMissFiles,LANGUAGE.Missingfiles);
 						choice = WindowPrompt(LANGUAGE.DownloadBoxartimage,tempCnt,LANGUAGE.Yes,LANGUAGE.No,0,0);
-						//WindowPrompt("Downloading","Please Wait Downloading Covers",0,0);
 						if (choice == 1)
 						{
 							ret = ProgressDownloadWindow(choice2);
@@ -3134,7 +3025,6 @@ static int MenuDiscList()
 
 		//Get selected game under cursor
 		int selectimg;//, promptnumber;
-		//promptnumber = 0;
 		char ID[4];
 		char IDfull[7];
 		selectimg = gameBrowser.GetSelectedOption();
@@ -3154,7 +3044,6 @@ static int MenuDiscList()
 				snprintf (ID,sizeof(ID),"%c%c%c", header->id[0], header->id[1], header->id[2]);
 				snprintf (IDfull,sizeof(IDfull),"%c%c%c%c%c%c", header->id[0], header->id[1], header->id[2],header->id[3], header->id[4], header->id[5]);
 				w.Remove(&DownloadBtn);
-//				w.Remove(coverImg);
 
 				if (GameIDTxt)
 				{
@@ -3270,9 +3159,9 @@ static int MenuDiscList()
 					{
 					favorite = game_num->favorite;
 					count = game_num->count;//count+=1;
-		
+
 					}count+=1;
-				
+
 				if(isSdInserted() == 1) {
 				if (CFG_save_game_num(header->id))
 				{
@@ -3372,7 +3261,7 @@ static int MenuDiscList()
 			bool returnHere = true;// prompt to start game
 			while (returnHere)
 			{
-				
+
 				returnHere = false;
 				wiilight(1);
 				choice = GameWindowPrompt();
@@ -3391,10 +3280,10 @@ static int MenuDiscList()
 					{
 					favorite = game_num->favorite;
 					count = game_num->count;//count+=1;
-		
+
 					}count+=1;
 
-				
+
 				if(isSdInserted() == 1) {
 				if (CFG_save_game_num(header->id))
 				{
@@ -3526,17 +3415,6 @@ static int MenuDiscList()
 	}
 
     HaltGui();
-	/*
-	#ifdef HW_RVL
-	for(i=0; i < 4; i++)
-	{
-		delete batteryTxt[i];
-		delete batteryImg[i];
-		delete batteryBarImg[i];
-		delete batteryBtn[i];
-	}
-	#endif
-	*/
 	mainWindow->Remove(&gameBrowser);
 	mainWindow->Remove(&w);
 	ResumeGui();
@@ -3773,7 +3651,6 @@ static int MenuFormat()
 			if(choice == 1)
 			{
                 SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0);
-                //exit(0); //zum debuggen schneller
 			}
 		}
 	}
@@ -3852,7 +3729,7 @@ static int MenuSettings()
 	backBtnTxt.SetMaxWidth(btnOutline.GetWidth()-30);
 	GuiImage backBtnImg(&btnOutline);
 	if (Settings.wsprompt == yes){
-	backBtnImg.SetWidescreen(CFG.widescreen);}//////
+	backBtnImg.SetWidescreen(CFG.widescreen);}
 	GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
 	backBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	backBtn.SetPosition(-180, 400);
@@ -3863,7 +3740,7 @@ static int MenuSettings()
 	backBtn.SetTrigger(&trigA);
 	backBtn.SetTrigger(&trigB);
 	backBtn.SetEffectGrow();
-	///////////////////////////////
+
 	GuiImage tab1Img(&tab1);
 	GuiImage tab2Img(&tab2);
 	GuiImage tab3Img(&tab3);
@@ -3872,30 +3749,16 @@ static int MenuSettings()
 	tabBtn.SetPosition(-202, 90);
 	tabBtn.SetImage(&tab1Img);
 
-
-
 	GuiButton page1Btn(40, 96);
 	page1Btn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	page1Btn.SetPosition(-202, 90);
 	page1Btn.SetSoundOver(&btnSoundOver);
 	page1Btn.SetSoundClick(&btnClick);
 	page1Btn.SetTrigger(0, &trigA);
-	//page1Btn.SetTrigger(&trigL);
-	//page1Btn.SetTrigger(&trigMinus);
 
-	//GuiTooltip page1BtnTT("Go to Page 1");
-	//if (Settings.wsprompt == yes)
-	//	page1BtnTT.SetWidescreen(CFG.widescreen);///////////
-
-	//page1Btn.SetToolTip(&page1BtnTT,105, 15);
-
-
-	//GuiImage page2Img(&page2);
-	//GuiImage page2dImg(&page2d);
 	GuiButton page2Btn(40, 96);
 	page2Btn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	page2Btn.SetPosition(-202, 186);
-	//page2Btn.SetImage(&page2dImg);
 	page2Btn.SetSoundOver(&btnSoundOver);
 	page2Btn.SetSoundClick(&btnClick);
 	page2Btn.SetTrigger(0, &trigA);
@@ -3905,29 +3768,19 @@ static int MenuSettings()
 	GuiButton page3Btn(40, 96);
 	page3Btn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	page3Btn.SetPosition(-202, 282);
-	//page2Btn.SetImage(&page2dImg);
 	page3Btn.SetSoundOver(&btnSoundOver);
 	page3Btn.SetSoundClick(&btnClick);
 	page3Btn.SetTrigger(0, &trigA);
 	page3Btn.SetTrigger(1, &trigR);
 	page3Btn.SetTrigger(2, &trigPlus);
 
-//	GuiTooltip page2BtnTT("%s 2",LANGUAGE.GotoPage);
-//	if (Settings.wsprompt == yes)
-//		page2BtnTT.SetWidescreen(CFG.widescreen);///////////
-
-//	page2Btn.SetToolTip(&page2BtnTT,105,0);
-
-	////////////////////////////////
-
-
 	const char * text = LANGUAGE.Unlock;
 	if (CFG.godmode == 1)
 			text = LANGUAGE.Lock;
-	GuiText lockBtnTxt(text, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
+	GuiText lockBtnTxt(text, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255});
 	lockBtnTxt.SetMaxWidth(btnOutline.GetWidth()-30);
 	GuiImage lockBtnImg(&btnOutline);
-	lockBtnImg.SetWidescreen(CFG.widescreen);//////
+	lockBtnImg.SetWidescreen(CFG.widescreen);
 	GuiButton lockBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
 	lockBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	lockBtn.SetPosition(180, 400);
@@ -4034,8 +3887,6 @@ static int MenuSettings()
 			sprintf(options2.name[6],"%s", LANGUAGE.CoverPath);
 			sprintf(options2.name[7],"%s", LANGUAGE.DiscimagePath);
 			sprintf(options2.name[8],"%s", LANGUAGE.ThemePath);
-
-
 		}
 		else if ( pageToDisplay == 3 )
 		{
@@ -4066,8 +3917,6 @@ static int MenuSettings()
 			sprintf(options2.name[7], " ");
 			sprintf(options2.name[8], "%s",LANGUAGE.MP3Menu);
 
-
-
 		}
 		while(menu == MENU_NONE)
 		{
@@ -4101,14 +3950,9 @@ static int MenuSettings()
 				else if (Settings.video == pal60) sprintf (options2.value[0],"%s PAL60",LANGUAGE.Force);
 				else if (Settings.video == ntsc) sprintf (options2.value[0],"%s NTSC",LANGUAGE.Force);
 
-				//if (Settings.vpatch == on) sprintf (options2.value[1],"%s",LANGUAGE.ON);
-				//else if (Settings.vpatch == off) sprintf (options2.value[1],"%s",LANGUAGE.OFF);
-
 				if (Settings.vpatch == on) sprintf (options2.value[1],"%s",LANGUAGE.ON);
 				else if (Settings.vpatch == off) sprintf (options2.value[1],"%s",LANGUAGE.OFF);
 
-
-
 				if (Settings.language == ConsoleLangDefault) sprintf (options2.value[2],"%s",LANGUAGE.ConsoleDefault);
 				else if (Settings.language == jap) sprintf (options2.value[2],"%s",LANGUAGE.Japanese);
 				else if (Settings.language == ger) sprintf (options2.value[2],"%s",LANGUAGE.German);
@@ -4328,7 +4172,7 @@ static int MenuSettings()
 							w.Append(&backBtn);
 							w.Append(&lockBtn);
 							if ( result == 1 )
-							{	
+							{
 								int len = (strlen(entered)-1);
 								if(entered[len] !='/')
 								strncat (entered, "/", 1);
@@ -4417,7 +4261,6 @@ static int MenuSettings()
                                 } else {
                                     WindowPrompt(LANGUAGE.NoSDcardinserted, LANGUAGE.InsertaSDCardtosave, LANGUAGE.ok, 0,0,0);
                                 }
-								/////load new theme//////////////
 								mainWindow->Remove(bgImg);
 								CFG_Load();
 								CFG_LoadGlobal();
@@ -4544,7 +4387,7 @@ static int MenuSettings()
                                 w.Append(&backBtn);
                                 w.Append(&lockBtn);
                                 if ( result == 1 )
-                                {	
+                                {
 									int len = (strlen(entered)-1);
 									if(entered[len] !='/')
 									strncat (entered, "/", 1);
@@ -4613,14 +4456,21 @@ static int MenuSettings()
                         Settings.unicodefix++;
                         break;
                     case 4:
-                        menu = MENU_OGG;
-                        pageToDisplay = 0;
+                        if(isSdInserted() == 1) {
+                            menu = MENU_OGG;
+                            pageToDisplay = 0;
+                        } else {
+                            WindowPrompt(LANGUAGE.NoSDcardinserted, LANGUAGE.InsertaSDCardtousethatoption, LANGUAGE.ok, 0,0,0);
+                        }
                         break;
                     case 8:
-                        menu = MENU_MP3;
-                        pageToDisplay = 0;
+                        if(isSdInserted() == 1) {
+                            menu = MENU_MP3;
+                            pageToDisplay = 0;
+                        } else {
+                            WindowPrompt(LANGUAGE.NoSDcardinserted, LANGUAGE.InsertaSDCardtousethatoption, LANGUAGE.ok, 0,0,0);
+                        }
                         break;
-
 			}
 
 			}
@@ -4634,8 +4484,6 @@ static int MenuSettings()
 			{
 				pageToDisplay = 1;
 				page1Btn.ResetState();
-				//page1Btn.SetImage(&page1Img);
-				//page2Btn.SetImage(&page2dImg);
 				tabBtn.SetImage(&tab1Img);
 				menu = MENU_NONE;
 				break;
@@ -4646,8 +4494,6 @@ static int MenuSettings()
 				pageToDisplay = 2;
 				menu = MENU_NONE;
 				page2Btn.ResetState();
-				//page1Btn.SetImage(&page1dImg);
-				//page2Btn.SetImage(&page2Img);
 				tabBtn.SetImage(&tab2Img);
 				break;
 			}
@@ -4839,7 +4685,7 @@ int GameSettings(struct discHdr * header)
 	cancelBtn.SetTrigger(&trigA);
 	cancelBtn.SetTrigger(&trigB);
 	cancelBtn.SetEffectGrow();
-	
+
 	GuiText deleteBtnTxt(LANGUAGE.Uninstall, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	deleteBtnTxt.SetMaxWidth(btnOutline.GetWidth()-30);
 	GuiImage deleteBtnImg(&btnOutline);
@@ -4880,11 +4726,11 @@ int GameSettings(struct discHdr * header)
 		{
 		faveChoice = game_num->favorite;
 		count = game_num->count;//count+=1;
-		
+
 	}
 	else {
 		faveChoice = no;}
-	
+
 
 	struct Game_CFG* game_cfg = CFG_get_game_opt(header->id);
 
@@ -4941,10 +4787,10 @@ int GameSettings(struct discHdr * header)
 
 		if (iosChoice == i249) sprintf (options3.value[4],"249");
 		else if (iosChoice == i222) sprintf (options3.value[4],"222");
-		
+
 		if (faveChoice == yes) sprintf (options3.value[5],"%s",LANGUAGE.Yes);
 		else if (faveChoice == no) sprintf (options3.value[5],"%s",LANGUAGE.No);
-		
+
 
 		if(shutdown == 1)
 			Sys_Shutdown();
@@ -4976,8 +4822,8 @@ int GameSettings(struct discHdr * header)
 		}
 
 		if(saveBtn.GetState() == STATE_CLICKED)
-		{	
-		
+		{
+
 			if(isSdInserted() == 1) {
 			//////////save game play count////////////////
 				extern u8 favorite;
@@ -4988,9 +4834,9 @@ int GameSettings(struct discHdr * header)
 					{
 					favorite = game_num->favorite;
 					count = game_num->count;//count+=1;
-		
+
 					}favorite = faveChoice;
-				
+
 				if(isSdInserted() == 1) {
 				if (CFG_save_game_num(header->id))
 				{
@@ -5550,7 +5396,6 @@ int MenuMp3()
 	cancelBtn.SetTrigger(&trigA);
 	cancelBtn.SetEffectGrow();
 
-//    bool isplaying = false;
 	int songPlaying=0;
 
 	GuiTrigger trigHome;
@@ -5564,7 +5409,6 @@ int MenuMp3()
 	GuiTrigger trigPlus;
 	trigPlus.SetButtonOnlyTrigger(-1, WPAD_BUTTON_PLUS | WPAD_CLASSIC_BUTTON_PLUS, 0);
 
-//	int playerIsUp=0;
 	snprintf(imgPath, sizeof(imgPath), "%sarrow_next.png", CFG.theme_path);
 	GuiImageData next(imgPath, arrow_next_png);
 	snprintf(imgPath, sizeof(imgPath), "%sarrow_previous.png", CFG.theme_path);
@@ -5667,9 +5511,7 @@ int MenuMp3()
 			sprintf(fullpath,"%s%s", mp3path,mp3files[ret]);
             PlayMp3(fullpath);
             SetMp3Volume(127);
-			//playBtn.SetImage(&playBtnImg);isplaying=true;
-			//if (isplaying==true){playBtn.SetImage(&pauseBtnImg);isplaying=false;}
-            playBtn.ResetState();
+			playBtn.ResetState();
 
     }
 
@@ -5678,24 +5520,20 @@ int MenuMp3()
 			StopMp3();
 			songPlaying++;
 			if (songPlaying>(countmp3 - 1)){songPlaying=0;}
-			//ret = (optionBrowser4.GetSelectedOption()+1);
 			sprintf(fullpath,"%s%s", mp3path,mp3files[songPlaying]);
             PlayMp3(fullpath);
             SetMp3Volume(127);
 			nextBtn.ResetState();
-				//break;
 			}
 	if(prevBtn.GetState() == STATE_CLICKED)
 			{
 				StopMp3();
 				songPlaying--;
 				if (songPlaying<0){songPlaying=(countmp3 - 1);}
-				//ret = (optionBrowser4.GetSelectedOption()-1);
 				sprintf(fullpath,"%s%s", mp3path,mp3files[songPlaying]);
 				PlayMp3(fullpath);
 				SetMp3Volume(127);
 				prevBtn.ResetState();
-				//break;
 			}
 	if(stopBtn.GetState() == STATE_CLICKED)
 			{	StopMp3();