diff --git a/README.txt b/README.txt index 8ab96be..61156ff 100644 --- a/README.txt +++ b/README.txt @@ -7,13 +7,34 @@ Snes9x TX is a fork of Snes9x GX: https://github.com/dborth/snes9xgx Update History -------------- +---Snes9x TX 1.1.2--- +---September 26 2022--- + +- Added new setting button to turn on/off start satellaview bios with bs games in menu settings +- Added option to turn on/off mute game sound in audio settings +- Updated french language file + +---Snes9x TX 1.1.1--- +---September 4 2022--- + +- Updated to the latest Snes9x (git 8685db4) +- Updated to the latest Snes9x GX (git 88deb03) +- Removed exit sound of UI (sometimes causes a small audio crackle when returning to game) +- Removed option to turn it on/off stereo inversion +- Removed filtered render and replaced render option by an option to turn on/off 240p output +- Added option to turn on/off bilinear filtering in video settings (works with 240p output) +- Added low/medium/max CPU overclocking option in emulation hacks settings +- Added new emulation hacks settings button and moved screenshot button to main game menu +- Updated all language files +- Updated and changed position of some text and UI PNG images + ---Snes9x TX 1.1.0--- ---June 23 2022--- - Updated to the latest Snes9x GX 4.5.3 - Disabled peripheral devices by default if not selected in controller settings -- Added new options to turn it on/off sprite limit and hi resolution in video settings - disable hi resolution to keep video filtering active with games using this mode +- Added new options to turn it on/off sprite limit and hi-res mode in video settings + disable hi-res mode to keep video filtering active with games using this mode - Added credits button in main menu settings (thanks InfiniteBlue!) - Updated credits - Updated all language files diff --git a/hbc/meta.xml b/hbc/meta.xml index 5298862..0015faa 100644 --- a/hbc/meta.xml +++ b/hbc/meta.xml @@ -2,8 +2,8 @@ Snes9x TX Tanooki - 1.1.0 - 20220623 + 1.1.2 + 20220926 Super Nintendo Emulator Snes9x TX is a fork of Snes9x GX on Wii. diff --git a/source/filebrowser.cpp b/source/filebrowser.cpp index e89f2ba..e3fff31 100644 --- a/source/filebrowser.cpp +++ b/source/filebrowser.cpp @@ -480,13 +480,17 @@ int WiiFileLoader() SNESROMSize = Memory.HeaderRemove(size, Memory.ROM); bsxBiosLoadFailed = false; - if(isBSX()) { - sprintf (filepath, "%s%s/BS-X.bin", pathPrefix[GCSettings.LoadMethod], APPFOLDER); + if(isBSX()) + { + if(GCSettings.Satellaview) + sprintf (filepath, "%s%s/BS-X.bin", pathPrefix[GCSettings.LoadMethod], APPFOLDER); + else + sprintf (filepath, "%s%s/", pathPrefix[GCSettings.LoadMethod], APPFOLDER); + if(LoadFile ((char *)Memory.BIOSROM, filepath, 0, 0x100000, SILENT) == 0) { bsxBiosLoadFailed = true; } } - return SNESROMSize; } diff --git a/source/filelist.h b/source/filelist.h index 20081ae..2010d97 100644 --- a/source/filelist.h +++ b/source/filelist.h @@ -36,7 +36,6 @@ #ifdef HW_RVL // background music is Wii-only #include "enter_ogg.h" -#include "exit_ogg.h" #endif #include "button_over_pcm.h" #include "button_click_pcm.h" @@ -48,14 +47,15 @@ #include "bg_bottom_png.h" #include "icon_settings_png.h" #include "icon_home_png.h" -#include "icon_credits_png.h" #include "icon_game_settings_png.h" #include "icon_game_cheats_png.h" +#include "icon_game_satellaview_png.h" #include "icon_game_controllers_png.h" #include "icon_game_load_png.h" #include "icon_game_save_png.h" #include "icon_game_delete_png.h" #include "icon_game_reset_png.h" +#include "icon_game_screenshot_png.h" #include "icon_settings_wiimote_png.h" #include "icon_settings_classic_png.h" #include "icon_settings_gamecube_png.h" @@ -70,9 +70,10 @@ #include "icon_settings_file_png.h" #include "icon_settings_mappings_png.h" #include "icon_settings_menu_png.h" +#include "icon_settings_credits_png.h" #include "icon_settings_video_png.h" #include "icon_settings_audio_png.h" -#include "icon_settings_screenshot_png.h" +#include "icon_settings_hacks_png.h" #include "button_png.h" #include "button_over_png.h" #include "button_prompt_png.h" diff --git a/source/filter.cpp b/source/filter.cpp index a4d2b80..a255968 100644 --- a/source/filter.cpp +++ b/source/filter.cpp @@ -2,6 +2,7 @@ * Snes9x Nintendo Wii/GameCube Port * * Michniewski 2008 + * Tanooki 2019-2022 * * Scale2x filter * (c) Copyright 2001 Andrea Mazzoleni (amadvance@gmail.com) diff --git a/source/filter.h b/source/filter.h index 0019ec8..92e3af9 100644 --- a/source/filter.h +++ b/source/filter.h @@ -2,6 +2,7 @@ * Snes9x Nintendo Wii/GameCube Port * * Michniewski 2008 + * Tanooki 2019-2022 * * filter.h * diff --git a/source/gui/gui_filebrowser.cpp b/source/gui/gui_filebrowser.cpp index 923546e..202e609 100644 --- a/source/gui/gui_filebrowser.cpp +++ b/source/gui/gui_filebrowser.cpp @@ -51,7 +51,7 @@ GuiFileBrowser::GuiFileBrowser(int w, int h) scrollbarImg = new GuiImage(scrollbar); scrollbarImg->SetParent(this); scrollbarImg->SetAlignment(ALIGN_RIGHT, ALIGN_TOP); - scrollbarImg->SetPosition(0, 30); + scrollbarImg->SetPosition(-10, 29); arrowDown = new GuiImageData(scrollbar_arrowdown_png); arrowDownImg = new GuiImage(arrowDown); @@ -71,6 +71,7 @@ GuiFileBrowser::GuiFileBrowser(int w, int h) arrowUpBtn->SetImage(arrowUpImg); arrowUpBtn->SetImageOver(arrowUpOverImg); arrowUpBtn->SetAlignment(ALIGN_RIGHT, ALIGN_TOP); + arrowUpBtn->SetPosition(-10, -1); arrowUpBtn->SetSelectable(false); arrowUpBtn->SetClickable(false); arrowUpBtn->SetHoldable(true); @@ -83,6 +84,7 @@ GuiFileBrowser::GuiFileBrowser(int w, int h) arrowDownBtn->SetImage(arrowDownImg); arrowDownBtn->SetImageOver(arrowDownOverImg); arrowDownBtn->SetAlignment(ALIGN_RIGHT, ALIGN_BOTTOM); + arrowDownBtn->SetPosition(-10, -1); arrowDownBtn->SetSelectable(false); arrowDownBtn->SetClickable(false); arrowDownBtn->SetHoldable(true); @@ -112,7 +114,7 @@ GuiFileBrowser::GuiFileBrowser(int w, int h) fileListBg[i] = new GuiImage(bgFileSelectionEntry); fileListIcon[i] = NULL; - fileList[i] = new GuiButton(295, 26); + fileList[i] = new GuiButton(285, 26); fileList[i]->SetParent(this); fileList[i]->SetLabel(fileListText[i]); fileList[i]->SetImageOver(fileListBg[i]); @@ -425,13 +427,13 @@ void GuiFileBrowser::Update(GuiTrigger * t) if(positionWiimote > 0) { position = positionWiimote; // follow wiimote cursor - scrollbarBoxBtn->SetPosition(0,position+36); + scrollbarBoxBtn->SetPosition(-10,position+36); } else if(listChanged || numEntries != browser.numEntries) { if(float((browser.pageIndex<<1))/(float(FILE_PAGESIZE)) < 1.0) { - position = 0; + position = -1; } else if(browser.pageIndex+FILE_PAGESIZE >= browser.numEntries) { @@ -441,7 +443,7 @@ void GuiFileBrowser::Update(GuiTrigger * t) { position = 156 * (browser.pageIndex + FILE_PAGESIZE/2) / (float)browser.numEntries; } - scrollbarBoxBtn->SetPosition(0,position+36); + scrollbarBoxBtn->SetPosition(-10,position+36); } listChanged = false; diff --git a/source/gui/gui_optionbrowser.cpp b/source/gui/gui_optionbrowser.cpp index 204a428..07f4cdd 100644 --- a/source/gui/gui_optionbrowser.cpp +++ b/source/gui/gui_optionbrowser.cpp @@ -43,7 +43,7 @@ GuiOptionBrowser::GuiOptionBrowser(int w, int h, OptionList * l) scrollbarImg = new GuiImage(scrollbar); scrollbarImg->SetParent(this); scrollbarImg->SetAlignment(ALIGN_RIGHT, ALIGN_TOP); - scrollbarImg->SetPosition(0, 30); + scrollbarImg->SetPosition(0, 29); arrowDown = new GuiImageData(scrollbar_arrowdown_png); arrowDownImg = new GuiImage(arrowDown); @@ -59,6 +59,7 @@ GuiOptionBrowser::GuiOptionBrowser(int w, int h, OptionList * l) arrowUpBtn->SetImage(arrowUpImg); arrowUpBtn->SetImageOver(arrowUpOverImg); arrowUpBtn->SetAlignment(ALIGN_RIGHT, ALIGN_TOP); + arrowUpBtn->SetPosition(0, -1); arrowUpBtn->SetSelectable(false); arrowUpBtn->SetTrigger(trigA); arrowUpBtn->SetSoundOver(btnSoundOver); @@ -69,6 +70,7 @@ GuiOptionBrowser::GuiOptionBrowser(int w, int h, OptionList * l) arrowDownBtn->SetImage(arrowDownImg); arrowDownBtn->SetImageOver(arrowDownOverImg); arrowDownBtn->SetAlignment(ALIGN_RIGHT, ALIGN_BOTTOM); + arrowDownBtn->SetPosition(0, -1); arrowDownBtn->SetSelectable(false); arrowDownBtn->SetTrigger(trigA); arrowDownBtn->SetSoundOver(btnSoundOver); diff --git a/source/gui/gui_savebrowser.cpp b/source/gui/gui_savebrowser.cpp index 9d5a545..b874340 100644 --- a/source/gui/gui_savebrowser.cpp +++ b/source/gui/gui_savebrowser.cpp @@ -48,7 +48,7 @@ GuiSaveBrowser::GuiSaveBrowser(int w, int h, SaveList * s, int a) scrollbarImg = new GuiImage(scrollbar); scrollbarImg->SetParent(this); scrollbarImg->SetAlignment(ALIGN_RIGHT, ALIGN_TOP); - scrollbarImg->SetPosition(0, 30); + scrollbarImg->SetPosition(0, 29); arrowDown = new GuiImageData(scrollbar_arrowdown_png); arrowDownImg = new GuiImage(arrowDown); @@ -64,6 +64,7 @@ GuiSaveBrowser::GuiSaveBrowser(int w, int h, SaveList * s, int a) arrowUpBtn->SetImage(arrowUpImg); arrowUpBtn->SetImageOver(arrowUpOverImg); arrowUpBtn->SetAlignment(ALIGN_RIGHT, ALIGN_TOP); + arrowUpBtn->SetPosition(0, -1); arrowUpBtn->SetSelectable(false); arrowUpBtn->SetTrigger(trigA); arrowUpBtn->SetSoundOver(btnSoundOver); @@ -74,6 +75,7 @@ GuiSaveBrowser::GuiSaveBrowser(int w, int h, SaveList * s, int a) arrowDownBtn->SetImage(arrowDownImg); arrowDownBtn->SetImageOver(arrowDownOverImg); arrowDownBtn->SetAlignment(ALIGN_RIGHT, ALIGN_BOTTOM); + arrowDownBtn->SetPosition(0, -1); arrowDownBtn->SetSelectable(false); arrowDownBtn->SetTrigger(trigA); arrowDownBtn->SetSoundOver(btnSoundOver); diff --git a/source/images/bg_bottom.png b/source/images/bg_bottom.png index 941d84e..ad79d17 100644 Binary files a/source/images/bg_bottom.png and b/source/images/bg_bottom.png differ diff --git a/source/images/bg_game_selection.png b/source/images/bg_game_selection.png index ece648c..62b39f9 100644 Binary files a/source/images/bg_game_selection.png and b/source/images/bg_game_selection.png differ diff --git a/source/images/bg_game_selection_entry.png b/source/images/bg_game_selection_entry.png index a329901..328e0f3 100644 Binary files a/source/images/bg_game_selection_entry.png and b/source/images/bg_game_selection_entry.png differ diff --git a/source/images/bg_preview.png b/source/images/bg_preview.png index 4a616a8..75bcf8f 100644 Binary files a/source/images/bg_preview.png and b/source/images/bg_preview.png differ diff --git a/source/images/bg_top.png b/source/images/bg_top.png index 7f8e392..5bf6fda 100644 Binary files a/source/images/bg_top.png and b/source/images/bg_top.png differ diff --git a/source/images/button_arrow_down_over.png b/source/images/button_arrow_down_over.png index db43b62..82b81e2 100644 Binary files a/source/images/button_arrow_down_over.png and b/source/images/button_arrow_down_over.png differ diff --git a/source/images/button_arrow_left_over.png b/source/images/button_arrow_left_over.png index e3bf9b2..f939909 100644 Binary files a/source/images/button_arrow_left_over.png and b/source/images/button_arrow_left_over.png differ diff --git a/source/images/button_arrow_right_over.png b/source/images/button_arrow_right_over.png index 8a492b6..3ee670c 100644 Binary files a/source/images/button_arrow_right_over.png and b/source/images/button_arrow_right_over.png differ diff --git a/source/images/button_arrow_up_over.png b/source/images/button_arrow_up_over.png index ef07248..e46f12d 100644 Binary files a/source/images/button_arrow_up_over.png and b/source/images/button_arrow_up_over.png differ diff --git a/source/images/button_gamesave_blank.png b/source/images/button_gamesave_blank.png index 0b85864..68a8688 100644 Binary files a/source/images/button_gamesave_blank.png and b/source/images/button_gamesave_blank.png differ diff --git a/source/images/icon_game_cheats.png b/source/images/icon_game_cheats.png index ab4f81c..584833f 100644 Binary files a/source/images/icon_game_cheats.png and b/source/images/icon_game_cheats.png differ diff --git a/source/images/icon_game_reset.png b/source/images/icon_game_reset.png index 1c67096..91c834a 100644 Binary files a/source/images/icon_game_reset.png and b/source/images/icon_game_reset.png differ diff --git a/source/images/icon_game_satellaview.png b/source/images/icon_game_satellaview.png new file mode 100644 index 0000000..ab92140 Binary files /dev/null and b/source/images/icon_game_satellaview.png differ diff --git a/source/images/icon_game_save.png b/source/images/icon_game_save.png index 338404a..437890e 100644 Binary files a/source/images/icon_game_save.png and b/source/images/icon_game_save.png differ diff --git a/source/images/icon_settings_screenshot.png b/source/images/icon_game_screenshot.png similarity index 100% rename from source/images/icon_settings_screenshot.png rename to source/images/icon_game_screenshot.png diff --git a/source/images/icon_game_settings.png b/source/images/icon_game_settings.png index 6b34583..c111041 100644 Binary files a/source/images/icon_game_settings.png and b/source/images/icon_game_settings.png differ diff --git a/source/images/icon_credits.png b/source/images/icon_settings_credits.png similarity index 100% rename from source/images/icon_credits.png rename to source/images/icon_settings_credits.png diff --git a/source/images/icon_settings_file.png b/source/images/icon_settings_file.png index 0b75126..1df9c16 100644 Binary files a/source/images/icon_settings_file.png and b/source/images/icon_settings_file.png differ diff --git a/source/images/icon_settings_hacks.png b/source/images/icon_settings_hacks.png new file mode 100644 index 0000000..03caa28 Binary files /dev/null and b/source/images/icon_settings_hacks.png differ diff --git a/source/images/icon_settings_menu.png b/source/images/icon_settings_menu.png index e118aae..f440383 100644 Binary files a/source/images/icon_settings_menu.png and b/source/images/icon_settings_menu.png differ diff --git a/source/images/icon_settings_turbo.png b/source/images/icon_settings_turbo.png index 5735425..c36fd18 100644 Binary files a/source/images/icon_settings_turbo.png and b/source/images/icon_settings_turbo.png differ diff --git a/source/lang/ca.lang b/source/lang/ca.lang index 3457cc6..c1bcaaf 100644 --- a/source/lang/ca.lang +++ b/source/lang/ca.lang @@ -4,6 +4,9 @@ msgstr "&" msgid "16:9 Correction" msgstr "Correcció 16:9" +msgid "240p Output" +msgstr "Sortida de 240p" + msgid "7z decompression failed: Archive contains too many files" msgstr "Error descomprimint 7z: L'arxiu conté massa fitxers" @@ -46,6 +49,9 @@ msgstr "Detectant dispositiu de càrrega..." msgid "Attempting to determine save device..." msgstr "Detectant el dispositiu d'enmagatzament" +msgid "Audio" +msgstr "Àudio" + msgid "Auto Detect" msgstr "Auto detectar" @@ -56,7 +62,7 @@ msgid "Auto Save" msgstr "Auto desar" msgid "Automatic (Recommended)" -msgstr "Automàtic (Recomenat)" +msgstr "Automàtic (recomenat)" msgid "B (Rapid)" msgstr "B (Ràpid)" @@ -64,6 +70,9 @@ msgstr "B (Ràpid)" msgid "Back" msgstr "Enrera" +msgid "Bilinear Filtering" +msgstr "Filtrar bilineal" + msgid "Button Mappings" msgstr "Redefinir botons" @@ -106,18 +115,12 @@ msgstr "Carpeta covers" msgid "Credits" msgstr "Crèdits" -msgid "Crosshair" -msgstr "Punter" - msgid "Cursor" msgstr "Cursor" msgid "Data DVD" msgstr "Dades DVD" -msgid "Default" -msgstr "Per defecte" - msgid "Delete" msgstr "Suprimeix" @@ -139,6 +142,9 @@ msgstr "Holandès" msgid "Empty or invalid ZIP file!" msgstr "Fitxer zip buit o invàlid!" +msgid "Emulation Hacks" +msgstr "Hacks d'emulació" + msgid "English" msgstr "Anglès" @@ -172,9 +178,6 @@ msgstr "Surt" msgid "Exit Action" msgstr "Mode sortida" -msgid "Filtered" -msgstr "Filtrat" - msgid "Filtering" msgstr "Filtrar" @@ -187,18 +190,27 @@ msgstr "Francès" msgid "Game Settings" msgstr "Configuració" +msgid "Game Settings - Audio" +msgstr "Configuració - Àudio" + msgid "Game Settings - Button Mappings" msgstr "Configuració - Redefinir botons" msgid "Game Settings - Cheats" msgstr "Configuració - Cheats" +msgid "Game Settings - Emulation Hacks" +msgstr "Configuració - Hacks d'emulació" + msgid "Game Settings - Video" msgstr "Configuració - Vídeo" msgid "GameCube Controller" msgstr "Comandament Gamecube" +msgid "Gaussian (Default)" +msgstr "Gaussià (per defecte)" + msgid "German" msgstr "Alemany" @@ -208,8 +220,8 @@ msgstr "Tornar" msgid "Hide SRAM Saving" msgstr "Amaga desar SRAM" -msgid "Hi Resolution" -msgstr "Alta resolució" +msgid "Hi-Res Mode" +msgstr "Mode alta-res" msgid "Horizontal" msgstr "Horitzontal" @@ -217,9 +229,6 @@ msgstr "Horitzontal" msgid "Information" msgstr "Informació" -msgid "Interpolation" -msgstr "Interpolació" - msgid "Invalid file size!" msgstr "Format fitxer invàlid!" @@ -262,6 +271,9 @@ msgstr "ESQUERRA" msgid "Left Button" msgstr "Botó esquerre" +msgid "Linear" +msgstr "Lineal" + msgid "Load" msgstr "Carregar" @@ -286,6 +298,9 @@ msgstr "Carregant patch..." msgid "Loading..." msgstr "Carregant..." +msgid "Low" +msgstr "Baix" + msgid "Main Menu" msgstr "Inici" @@ -295,9 +310,15 @@ msgstr "Coincidir controls GC" msgid "Match Wii Controls" msgstr "Coincidir controls Wii" +msgid "Max" +msgstr "Màx" + msgid "Maximum filepath length reached!" msgstr "Llargada màxima de ruta!" +msgid "Medium" +msgstr "Mitjà" + msgid "Menu" msgstr "Menú" @@ -316,15 +337,9 @@ msgstr "Silenci" msgid "New" msgstr "Nou" -msgid "New Snapshot" -msgstr "Nova captura" - msgid "New SRAM" msgstr "Nova SRAM" -msgid "No data to save!" -msgstr "cap dada per desar!" - msgid "No disc inserted!" msgstr "No hi ha cap disc!" @@ -406,15 +421,9 @@ msgstr "Treure joc? Qualsevol progrés no desat serà perdut." msgid "R TRIG" msgstr "R" -msgid "RAM saving is not available for FDS games!" -msgstr "Desar RAM és incompatible per als jocs FDS!" - msgid "Reboot" msgstr "Reiniciar" -msgid "Rendering" -msgstr "Renderitzat" - msgid "Reset" msgstr "Reiniciar" @@ -449,7 +458,7 @@ msgid "Right Button" msgstr "Botó dret" msgid "Right Stick (Default)" -msgstr "Joystick dret (Per defecte)" +msgstr "Joystick dret (per defecte)" msgid "Save" msgstr "Desar" @@ -469,14 +478,8 @@ msgstr "Carpeta de save" msgid "Save Game" msgstr "Desar Joc" -msgid "Save RAM and State?" -msgstr "Desar RAM i estat?" - -msgid "Save Snapshot?" -msgstr "Desar imatge?" - -msgid "Save SRAM and Snapshot?" -msgstr "Desar SRAM i imatge?" +msgid "Save SRAM and State?" +msgstr "Desar SRAM i estat?" msgid "Save State?" msgstr "Desar estat?" @@ -493,9 +496,6 @@ msgstr "Desant preferències..." msgid "Saving..." msgstr "Desant..." -msgid "Scaling" -msgstr "Ajust" - msgid "Screen Position" msgstr "Posició pantalla" @@ -520,18 +520,15 @@ msgstr "No trobo targeta SD!" msgid "Shift" msgstr "Maj." +msgid "Show Crosshair" +msgstr "Mostra punter" + msgid "Show Frame Rate" msgstr "Mostra FPS" msgid "Chinese (Simplified)" msgstr "Xinès simpl." -msgid "Snapshot" -msgstr "Imatge" - -msgid "Snapshot (Auto)" -msgstr "Imatge (Auto)" - msgid "SNES Controller" msgstr "Comandament SNES" @@ -565,11 +562,14 @@ msgstr "Ratolí SNES - Wiimote" msgid "Sound Effects Volume" msgstr "Volum d'efectes sonors" +msgid "Sound Interpolation" +msgstr "Interpolació sonora" + msgid "Spanish" msgstr "Castellà" msgid "Sprite Limit" -msgstr "Límit sprites" +msgstr "Límit de sprites" msgid "SRAM file not found" msgstr "No trobo fitxer SRAM" @@ -583,9 +583,6 @@ msgstr "Estat (Auto)" msgid "State file not found" msgstr "No trobo fitxer d'estat" -msgid "Stereo Inversion" -msgstr "Estèreo invers" - msgid "Super Scope - GameCube Controller" msgstr "Super Scope - Comandament GameCube" @@ -604,9 +601,6 @@ msgstr "No trobo dispositiu per desar!" msgid "Unable to open state!" msgstr "Impossible obrir l'estat!" -msgid "Unfiltered" -msgstr "No filtrat" - msgid "Unknown file type!" msgstr "Fitxer desconegut!" diff --git a/source/lang/de.lang b/source/lang/de.lang index 913ddea..a797381 100644 --- a/source/lang/de.lang +++ b/source/lang/de.lang @@ -2,7 +2,10 @@ msgid "&" msgstr "" msgid "16:9 Correction" -msgstr "16:9" +msgstr "16:9 Korrektur" + +msgid "240p Output" +msgstr "240p Ausgabe" msgid "7z decompression failed: Archive contains too many files" msgstr "7z Dekomprimierung fehlgeschlagen: Archiv enthält zu viele Dateien" @@ -67,6 +70,9 @@ msgstr "B (Turbo)" msgid "Back" msgstr "Zurück" +msgid "Bilinear Filtering" +msgstr "Bilineare Filter" + msgid "Button Mapping" msgstr "Tastenbelegung" @@ -100,8 +106,8 @@ msgstr "Cover anzeigen" msgid "Covers Folder" msgstr "Ordner f. Cover" -msgid "Crosshair" -msgstr "Fadenkreuz" +msgid "CPU Overclocking" +msgstr "CPU Übertaktung" msgid "Cursor" msgstr "Eingabezeiger" @@ -109,9 +115,6 @@ msgstr "Eingabezeiger" msgid "Data DVD" msgstr "Daten DVD" -msgid "Default" -msgstr "Standard" - msgid "Delete" msgstr "Löschen" @@ -169,9 +172,6 @@ msgstr "Beenden" msgid "Exit Action" msgstr "Aktion beim Beenden" -msgid "Filtered" -msgstr "Gefiltert" - msgid "Filtering" msgstr "Filter" @@ -182,10 +182,10 @@ msgid "French" msgstr "Französich" msgid "Game Settings" -msgstr "Spiel Einstellungen" +msgstr "Spieleinstellungen" msgid "Game Settings - Audio" -msgstr "Spiel Einstellungen - Audio" +msgstr "Spieleinstellungen - Audio" msgid "Game Settings - Button Mappings" msgstr "Spieleinstellungen - Tastenbelegung" @@ -193,9 +193,15 @@ msgstr "Spieleinstellungen - Tastenbelegung" msgid "Game Settings - Cheats" msgstr "Spieleinstellungen - Cheats" +msgid "Game Settings - Emulation Hacks" +msgstr "Spieleinstellungen - Emulation Hacks" + msgid "Game Settings - Video" msgstr "Spieleinstellungen - Video" +msgid "Gaussian (Default)" +msgstr "Gauß (Standard)" + msgid "German" msgstr "Deutsch" @@ -205,14 +211,8 @@ msgstr "Zurück" msgid "Hide SRAM Saving" msgstr "Ausblenden speichern SRAM" -msgid "Hi Resolution" -msgstr "Hohe Auflösung" - -msgid "Insert Coin" -msgstr "Münze einwerfen" - -msgid "Insert Coin / Switch Disk" -msgstr "Münze einwerfen / Disc wechseln" +msgid "Hi-Res Mode" +msgstr "Hi-Res Modus" msgid "Invalid file size!" msgstr "Ungültige Dateigröße!" @@ -277,6 +277,9 @@ msgstr "Lade Patch..." msgid "Loading..." msgstr "Lade..." +msgid "Low" +msgstr "Niedrig" + msgid "Main Menu" msgstr "Hauptmenü" @@ -304,18 +307,12 @@ msgstr "Stumm" msgid "New" msgstr "Neu" -msgid "New Snapshot" -msgstr "Neuer Schnappschuss" - msgid "New SRAM" msgstr "Neuer SRAM" msgid "No" msgstr "Nein" -msgid "No data to save!" -msgstr "Keine Daten gespeichert!" - msgid "No disc inserted!" msgstr "Keine Disc eingelegt!" @@ -331,9 +328,15 @@ msgstr "Nichts" msgid "Off" msgstr "Aus" +msgid "OFF" +msgstr "AUS" + msgid "On" msgstr "An" +msgid "ON" +msgstr "AN" + msgid "Out of memory!" msgstr "Nicht genug Speicher!" @@ -391,15 +394,9 @@ msgstr "Spiel beenden" msgid "Quit this game? Any unsaved progress will be lost." msgstr "Dieses Spiel beenden? Ungespeicherter Fortschritt geht verloren." -msgid "RAM saving is not available for FDS games!" -msgstr "RAM speichern ist für FDS Spiele nicht verfügbar!" - msgid "Reboot" msgstr "Neustart" -msgid "Rendering" -msgstr "Darstellung" - msgid "Reset" msgstr "Zurücksetzen" @@ -457,14 +454,8 @@ msgstr "Ordner f. Spielstände" msgid "Save Game" msgstr "Spiel speichern" -msgid "Save RAM and State?" -msgstr "RAM und Status speichern?" - -msgid "Save Snapshot?" -msgstr "Schnappschuss speichern?" - -msgid "Save SRAM and Snapshot?" -msgstr "SRAM und Schnappschuss speichern?" +msgid "Save SRAM and State?" +msgstr "SRAM und Status speichern?" msgid "Save State?" msgstr "Status speichern?" @@ -481,9 +472,6 @@ msgstr "Einstellungen werden gespeichert..." msgid "Saving..." msgstr "Speichern..." -msgid "Scaling" -msgstr "Auflösung" - msgid "Screen Position" msgstr "Bildschirm Position" @@ -505,15 +493,12 @@ msgstr "Einstellungen - Speichern & Laden" msgid "SD card not found!" msgstr "SD Card nicht gefunden!" +msgid "Show Crosshair" +msgstr "Zeige Fadenkreuz" + msgid "Show Frame Rate" msgstr "Zeige Bildfrequenz" -msgid "Snapshot" -msgstr "Schnappschuss" - -msgid "Snapshot (Auto)" -msgstr "Schnappschuss (Auto)" - msgid "SNES Controller - Nunchuk + Wiimote" msgstr "SNES Controller - Nunchuk + Wii-FB" @@ -547,8 +532,8 @@ msgstr "Status (Auto)" msgid "State file not found" msgstr "Statusdatei nicht gefunden" -msgid "Stereo Inversion" -msgstr "Stereo-Invertierung" +msgid "SuperFX Overclocking" +msgstr "SuperFX Übertaktung" msgid "Stretch to Fit" msgstr "Strecken zum Einpassen" @@ -563,10 +548,13 @@ msgid "Super Scope - Wiimote" msgstr "Nintendo Scope - Wii-FB" msgid "Turbo Mode" -msgstr "Turbo-Modus" +msgstr "Turbomodus" msgid "Turbo Mode Button" -msgstr "Turbo-Modus-Taste" +msgstr "Taste Turbomodus" + +msgid "TV Mode" +msgstr "TV Modus" msgid "Unable to locate a load device!" msgstr "Ladegerät konnte nicht gefunden werden!" @@ -577,9 +565,6 @@ msgstr "Speichergerät konnte nicht gefunden werden!" msgid "Unable to open state!" msgstr "Status konnte nicht geöffnet werden!" -msgid "Unfiltered" -msgstr "Ungefiltert" - msgid "Unknown file type!" msgstr "Unbekannter Dateityp!" diff --git a/source/lang/es.lang b/source/lang/es.lang index 868f044..66caa52 100644 --- a/source/lang/es.lang +++ b/source/lang/es.lang @@ -4,6 +4,9 @@ msgstr "y" msgid "16:9 Correction" msgstr "Corrección 16:9" +msgid "240p Output" +msgstr "Salida de 240p" + msgid "7z decompression failed: Archive contains too many files." msgstr "Descompresión 7z falló: El archivo contiene demasiados archivos." @@ -67,6 +70,9 @@ msgstr "Automático (Recomendado)" msgid "Back" msgstr "Atrás" +msgid "Bilinear Filtering" +msgstr "Filtro Bilineal" + msgid "Brazilian Portuguese" msgstr "Portugués Brasileño" @@ -121,9 +127,6 @@ msgstr "Créditos" msgid "Data DVD" msgstr "DVD Datos" -msgid "Default" -msgstr "Por Defecto" - msgid "Delete" msgstr "Eliminar" @@ -151,6 +154,9 @@ msgstr "ABAJO" msgid "Dutch" msgstr "Holandés" +msgid "Emulation Hacks" +msgstr "Hacks de Emulación" + msgid "English" msgstr "Inglés" @@ -199,12 +205,18 @@ msgstr "Francés" msgid "Game Settings" msgstr "Configuración" +msgid "Game Settings - Audio" +msgstr "Configuración - Audio" + msgid "Game Settings - Button Mappings" msgstr "Configuración - Controles" msgid "Game Settings - Cheats" msgstr "Configuración - Trucos" +msgid "Game Settings - Emulation Hacks" +msgstr "Configuración - Hacks de Emulación" + msgid "Game Settings - Video" msgstr "Configuración - Vídeo" @@ -220,8 +232,8 @@ msgstr "Volver" msgid "Hide SRAM Saving" msgstr "Ocultar SRAM Guardar" -msgid "Hi Resolution" -msgstr "Alta Resolución" +msgid "Hi-Res Mode" +msgstr "Modo Alta-Res" msgid "Information" msgstr "Información" @@ -265,12 +277,21 @@ msgstr "Cargando DVD..." msgid "Loading..." msgstr "Cargando..." +msgid "Low" +msgstr "Bajo" + msgid "Main Menu" msgstr "Menú Principal" +msgid "Max" +msgstr "Máximo" + msgid "Maximum filepath length reached!" msgstr "¡Longitud máxima de la ruta del archivo alcanzada!" +msgid "Medium" +msgstr "Medio" + msgid "Menu" msgstr "Menú" @@ -361,9 +382,6 @@ msgstr "¿Salir del juego? Se perderá cualquier progreso no guardado." msgid "Reboot" msgstr "Reiniciar" -msgid "Rendering" -msgstr "Renderizado" - msgid "Reset" msgstr "Reiniciar" @@ -424,9 +442,6 @@ msgstr "Guardando configuraciones..." msgid "Saving..." msgstr "Guardando..." -msgid "Scaling" -msgstr "Escalado" - msgid "Screen Position" msgstr "Posición de Pantalla" @@ -472,15 +487,15 @@ msgstr "Mayús" msgid "Sound Effects Volume" msgstr "Volumen de los Efectos" +msgid "Sound Interpolation" +msgstr "Interpolación de Sonido" + msgid "Spanish" msgstr "Español" msgid "State" msgstr "Estado" -msgid "Stereo Inversion" -msgstr "Inversión Estéreo" - msgid "The current IOS has been altered (fake-signed). Functionality and/or stability may be adversely affected." msgstr "El IOS actual ha sido alterado (falso firmado). La funcionalidad y/o la estabilidad pueden verse afectadas negativamente." @@ -502,9 +517,6 @@ msgstr "¡No se puede localizar un dispositivo para carga!" msgid "Unable to locate a save device!" msgstr "¡No se puede encontrar un dispositivo para guardados!" -msgid "Unfiltered" -msgstr "Sin filtrado" - msgid "Unrecognized DVD format." msgstr "Formato de DVD no reconocido." @@ -541,29 +553,14 @@ msgstr "Apuntar Fuera de Pantalla" msgid "Coding" msgstr "Programación" -msgid "Crosshair" -msgstr "Cursor" - -msgid "Cursor" -msgstr "Cursor" - -msgid "Filtered" -msgstr "Filtrado" - msgid "Filtering" msgstr "Filtro" msgid "Fire" msgstr "Disparar" -msgid "Game Settings - Audio" -msgstr "Configuración - Audio" - -msgid "Gaussian (SNES Hardware)" -msgstr "Gausiana (Hardware de SNES)" - -msgid "Interpolation" -msgstr "Interpolación" +msgid "Gaussian (Default)" +msgstr "Gausiana (Por Defecto)" msgid "Left Button" msgstr "Botón Izquierdo" @@ -577,6 +574,12 @@ msgstr "¡No hay datos SRAM para guardar!" msgid "None" msgstr "Ninguno" +msgid "OFF" +msgstr "Desactivado" + +msgid "ON" +msgstr "Activado" + msgid "Progressive (480p)" msgstr "Progresivo (480p)" @@ -589,6 +592,9 @@ msgstr "¡Error al guardar!" msgid "Save SRAM and State?" msgstr "¿Guardar SRAM y partida?" +msgid "Show Crosshair" +msgstr "Mostrar Cursor" + msgid "Show Frame Rate" msgstr "Mostrar FPS" @@ -613,9 +619,6 @@ msgstr "Límite de Sprites" msgid "SRAM file not found" msgstr "Archivo SRAM no encontrado." -msgid "SuperFX Overclock" -msgstr "Overclock SuperFX" - msgid "This software is open source and may be copied, distributed, or modified" msgstr "Este software es de código abierto y puede ser copiado, distribuido, o modificado" diff --git a/source/lang/fr.lang b/source/lang/fr.lang index 9970795..2ccb9bd 100644 --- a/source/lang/fr.lang +++ b/source/lang/fr.lang @@ -4,6 +4,9 @@ msgstr "&" msgid "16:9 Correction" msgstr "Correction 16:9" +msgid "240p Output" +msgstr "Sortie 240p" + msgid "7z decompression failed: Archive contains too many files" msgstr "La décompression 7z a échoué : l'archive contient trop de fichiers" @@ -23,13 +26,13 @@ msgid "7z decompression failed: File uses unsupported compression settings" msgstr "La décompression 7z a échoué : le fichier utilise des paramètres de compression non supportés" msgid "A (Rapid)" -msgstr "A (rapide)" +msgstr "A (Rapide)" msgid "Additional improvements" msgstr "Améliorations supplémentaires" msgid "Aim Offscreen" -msgstr "Visée hors champ" +msgstr "Visée Hors Champ" msgid "Are you sure that you want to reset this game? Any unsaved progress will be lost." msgstr "Êtes-vous sûr de vouloir redémarrer ce jeu ? Toute progression non sauvegardée sera perdue." @@ -44,7 +47,7 @@ msgid "Artwork" msgstr "Illustrations" msgid "Artwork Folder" -msgstr "Dossier des illustrations" +msgstr "Dossier des Illustrations" msgid "Attempting to determine load device..." msgstr "Tentative de détection du périphérique d'entrée..." @@ -53,34 +56,37 @@ msgid "Attempting to determine save device..." msgstr "Tentative de détection du périphérique de sauvegarde..." msgid "Auto Detect" -msgstr "Détection auto" +msgstr "Détection Auto" msgid "Auto Load" -msgstr "Chargement auto" +msgstr "Chargement Auto" msgid "Auto Save" -msgstr "Sauvegarde auto" +msgstr "Sauvegarde Auto" msgid "Automatic" msgstr "Automatique" msgid "Automatic (Recommended)" -msgstr "Automatique (recommandé)" +msgstr "Automatique (Recommandé)" msgid "B (Rapid)" -msgstr "B (rapide)" +msgstr "B (Rapide)" msgid "Back" msgstr "Retour" +msgid "Bilinear Filtering" +msgstr "Filtrage Bilinéaire" + msgid "Brazilian Portuguese" -msgstr "Portugais brésilien" +msgstr "Portugais Brésilien" msgid "Button Mapping" msgstr "Contrôles" msgid "Button Mappings" -msgstr "Redéfinir les touches" +msgstr "Redéfinir les Touches" msgid "Cancel" msgstr "Annuler" @@ -95,10 +101,10 @@ msgid "Cheats file not found!" msgstr "Fichier de triches non trouvé !" msgid "Cheats Folder" -msgstr "Dossier des triches" +msgstr "Dossier des Triches" msgid "Choose Game" -msgstr "Choisir un jeu" +msgstr "Choisir un Jeu" msgid "Classic Controller" msgstr "Manette Classique" @@ -119,14 +125,11 @@ msgid "Cover View" msgstr "Jaquette" msgid "Covers Folder" -msgstr "Dossier des jaquettes" +msgstr "Dossier des Jaquettes" msgid "Credits" msgstr "Crédits" -msgid "Crosshair" -msgstr "Réticule de visée" - msgid "Cubic" msgstr "Cubique" @@ -136,17 +139,14 @@ msgstr "Curseur" msgid "Data DVD" msgstr "Lecteur DVD" -msgid "Default" -msgstr "Par défaut" - msgid "Delete" msgstr "Effacer" msgid "Delete File" -msgstr "Effacer le fichier" +msgstr "Effacer le Fichier" msgid "Delete Saves" -msgstr "Effacer les sauvegardes" +msgstr "Effacer les Sauvegardes" msgid "Delete this save file? Deleted files can not be restored." msgstr "Effacer cette sauvegarde ? Les fichiers supprimés ne peuvent pas être restaurés." @@ -158,7 +158,7 @@ msgid "under the terms of the GNU General Public License (GPL) Version 2." msgstr "sous les termes de la licence publique générale GNU (GPL) version 2." msgid "Don't Save" -msgstr "Ne pas sauver" +msgstr "Ne pas Sauver" msgid "Down" msgstr "Bas" @@ -172,6 +172,9 @@ msgstr "Néerlandais" msgid "Empty or invalid ZIP file!" msgstr "Fichier ZIP vide ou invalide !" +msgid "Emulation Hacks" +msgstr "Hacks d'Émulation" + msgid "English" msgstr "Anglais" @@ -206,10 +209,7 @@ msgid "Exit" msgstr "Sortir" msgid "Exit Action" -msgstr "Sortie de l'émulateur" - -msgid "Filtered" -msgstr "Filtré" +msgstr "Sortie de l'Émulateur" msgid "Filtering" msgstr "Filtrage" @@ -233,19 +233,22 @@ msgid "Game Settings - Audio" msgstr "Configuration - Audio" msgid "Game Settings - Button Mappings" -msgstr "Configuration - Redéfinir les touches" +msgstr "Configuration - Redéfinir les Touches" msgid "Game Settings - Cheats" msgstr "Configuration - Triches" +msgid "Game Settings - Emulation Hacks" +msgstr "Configuration - Hacks d'Émulation" + msgid "Game Settings - Video" msgstr "Configuration - Vidéo" msgid "GameCube Controller" msgstr "Manette GameCube" -msgid "Gaussian (SNES Hardware)" -msgstr "Gaussienne (matériel SNES)" +msgid "Gaussian (Default)" +msgstr "Gaussienne (Par Défaut)" msgid "German" msgstr "Allemand" @@ -254,10 +257,10 @@ msgid "Go Back" msgstr "Retour" msgid "Hide SRAM Saving" -msgstr "Masquer sauvegarder SRAM" +msgstr "Masquer Sauvegarder SRAM" -msgid "Hi Resolution" -msgstr "Haute résolution" +msgid "Hi-Res Mode" +msgstr "Mode Haute-Rés" msgid "Invalid file size!" msgstr "Taille du fichier invalide !" @@ -290,7 +293,7 @@ msgid "Language" msgstr "Langage" msgid "Languages Folder" -msgstr "Dossier des langues" +msgstr "Dossier des Langues" msgid "Left" msgstr "Gauche" @@ -299,7 +302,7 @@ msgid "LEFT" msgstr "GAUCHE" msgid "Left Button" -msgstr "Clic gauche" +msgstr "Clic Gauche" msgid "Linear" msgstr "Linéaire" @@ -308,13 +311,13 @@ msgid "Load" msgstr "Charger" msgid "Load Device" -msgstr "Périphérique d'entrée" +msgstr "Périphérique d'Entrée" msgid "Load Folder" -msgstr "Dossier des jeux" +msgstr "Dossier des Jeux" msgid "Load Game" -msgstr "Charger une partie" +msgstr "Charger une Partie" msgid "Loading" msgstr "Chargement" @@ -328,18 +331,27 @@ msgstr "Chargement du patch en cours..." msgid "Loading..." msgstr "Chargement en cours..." +msgid "Low" +msgstr "Faible" + msgid "Main Menu" -msgstr "Menu principal" +msgstr "Menu Principal" msgid "Match GC Controls" -msgstr "Jouabilité GC identique" +msgstr "Jouabilité GC Identique" msgid "Match Wii Controls" -msgstr "Jouabilité Wii identique" +msgstr "Jouabilité Wii Identique" + +msgid "Max" +msgstr "Maximum" msgid "Maximum filepath length reached!" msgstr "La longueur maximale du chemin d'accés est atteinte !" +msgid "Medium" +msgstr "Moyen" + msgid "Menu artwork" msgstr "Éléments graphiques du menu" @@ -347,7 +359,7 @@ msgid "MINUS" msgstr "MOINS" msgid "Music Volume" -msgstr "Volume de la musique" +msgstr "Volume de la Musique" msgid "Mute" msgstr "Muet" @@ -355,18 +367,12 @@ msgstr "Muet" msgid "New" msgstr "Nouvelle" -msgid "New Snapshot" -msgstr "Nouvelle sauvegarde d'état" - msgid "New SRAM" -msgstr "Nouvelle sauvegarde SRAM" +msgstr "Nouvelle Sauvegarde SRAM" msgid "No" msgstr "Non" -msgid "No data to save!" -msgstr "Pas de données (RAM) à sauvegarder !" - msgid "No disc inserted!" msgstr "Aucun disque inséré !" @@ -398,7 +404,7 @@ msgid "P4" msgstr "J4" msgid "Please Wait" -msgstr "Veuillez patienter" +msgstr "Veuillez Patienter" msgid "Portuguese" msgstr "Portugais" @@ -428,10 +434,10 @@ msgid "Progressive (480p)" msgstr "Progressif (480p)" msgid "Preview Image" -msgstr "Aperçu de l'image" +msgstr "Aperçu de l'Image" msgid "Preview Screenshot" -msgstr "Capture d'écran" +msgstr "Capture d'Écran" msgid "Quit Game" msgstr "Quitter le Jeu" @@ -442,26 +448,20 @@ msgstr "Quitter ce jeu ? Toute progression non sauvegardée sera perdue." msgid "R TRIG" msgstr "R" -msgid "RAM saving is not available for FDS games!" -msgstr "La sauvegarde RAM n'est pas disponible pour les jeux FDS (Famicom Disk System) !" - msgid "Reboot" msgstr "Redémarrer" -msgid "Rendering" -msgstr "Rendu" - msgid "Reset" msgstr "Réinitialiser" msgid "Reset Game" -msgstr "Réinitialiser le jeu" +msgstr "Réinitialiser le Jeu" msgid "Reset this game? Any unsaved progress will be lost." msgstr "Réinitialiser ce jeu ? Toute progression non sauvegardée sera perdue." msgid "Reset Mappings" -msgstr "Réinit. les touches" +msgstr "Réinit. les Touches" msgid "Reset Settings" msgstr "Réinitialiser" @@ -473,7 +473,7 @@ msgid "Return to Loader" msgstr "Retourner au Loader" msgid "Return to Wii Menu" -msgstr "Retourner au menu Wii" +msgstr "Retourner au Menu Wii" msgid "Right" msgstr "Droite" @@ -482,10 +482,10 @@ msgid "RIGHT" msgstr "DROITE" msgid "Right Button" -msgstr "Clic droit" +msgstr "Clic Droit" msgid "Right Stick (Default)" -msgstr "Joystick droit (par défaut)" +msgstr "Joystick Droit (Par Défaut)" msgid "Save" msgstr "Sauver" @@ -494,7 +494,7 @@ msgid "Save a new Preview Screenshot? Current Screenshot image will be overwritt msgstr "Enregistrer une nouvelle capture d'écran ? La capture d'écran actuelle sera remplacée." msgid "Save Device" -msgstr "Périph. de sauvegarde" +msgstr "Périph. de Sauvegarde" msgid "Save failed!" msgstr "La sauvegarde a échoué !" @@ -503,22 +503,16 @@ msgid "Save file not found" msgstr "Pas de fichier de sauvegarde trouvé" msgid "Save Folder" -msgstr "Dossier des sauvegardes" +msgstr "Dossier des Sauvegardes" msgid "Save Game" -msgstr "Sauvegarder la partie" - -msgid "Save RAM and State?" -msgstr "Sauver la RAM et la position du jeu (sauvegarde d'état) ?" +msgstr "Sauvegarder la Partie" -msgid "Save Snapshot?" -msgstr "Sauver la position du jeu (sauvegarde d'état) ?" - -msgid "Save SRAM and Snapshot?" -msgstr "Sauver la SRAM et la position du jeu (sauvegarde d'état) ?" +msgid "Save SRAM and State?" +msgstr "Sauver la SRAM et la Sauvegarde d'État ?" msgid "Save State?" -msgstr "Sauver la position du jeu (sauvegarde d'état) ?" +msgstr "Sauver la Sauvegarde d'État ?" msgid "Save successful" msgstr "Sauvegarde réussie" @@ -532,23 +526,20 @@ msgstr "Sauvegarde des préférences en cours..." msgid "Saving..." msgstr "Sauvegarde en cours..." -msgid "Scaling" -msgstr "Format" - msgid "Screen Position" -msgstr "Position de l'écran" +msgstr "Position de l'Écran" msgid "Screen Zoom" -msgstr "Zoom de l'écran" +msgstr "Zoom de l'Écran" msgid "Screenshot" -msgstr "Capture d'écran" +msgstr "Capture d'Écran" msgid "Screenshots" -msgstr "Captures d'écran" +msgstr "Captures d'Écran" msgid "Screenshots Folder" -msgstr "Dossier des captures" +msgstr "Dossier des Captures" msgid "Settings" msgstr "Paramètres" @@ -557,7 +548,7 @@ msgid "Settings - Menu" msgstr "Paramètres - Menu" msgid "Settings - Saving & Loading" -msgstr "Paramètres - Sauvegarde & chargement" +msgstr "Paramètres - Sauvegarde & Chargement" msgid "SD Card" msgstr "Carte SD" @@ -571,17 +562,14 @@ msgstr "SD dans SP2" msgid "Shift" msgstr "Maj" +msgid "Show Crosshair" +msgstr "Afficher le Viseur" + msgid "Show Frame Rate" msgstr "Afficher les FPS" msgid "Chinese (Simplified)" -msgstr "Chinois (simplifié)" - -msgid "Snapshot" -msgstr "Sauvegarde d'état" - -msgid "Snapshot (auto)" -msgstr "Sauv. d'état (auto)" +msgstr "Chinois (Simplifié)" msgid "SNES Controller" msgstr "Manette SNES" @@ -614,32 +602,29 @@ msgid "SNES Mouse - Wiimote" msgstr "Souris SNES - Wiimote" msgid "Sound Effects Volume" -msgstr "Volume des effets sonores" +msgstr "Volume des Effets Sonores" + +msgid "Sound Interpolation" +msgstr "Interpolation Sonore" msgid "Spanish" msgstr "Espagnol" msgid "Sprite Limit" -msgstr "Limite de sprites" +msgstr "Limite de Sprites" msgid "SRAM file not found" msgstr "Pas de sauvegarde SRAM trouvée" msgid "State" -msgstr "Sauvegarde d'état" +msgstr "Sauvegarde d'État" msgid "State (Auto)" -msgstr "Sauv. d'état (auto)" +msgstr "Sauv. d'État (Auto)" msgid "State file not found" msgstr "Pas de sauvegarde d'état trouvée" -msgid "Stereo Inversion" -msgstr "Inversion stéréo" - -msgid "SuperFX Overclock" -msgstr "Overclock SuperFX" - msgid "Super Scope" msgstr "Nintendo Scope" @@ -659,10 +644,10 @@ msgid "This software is open source and may be copied, distributed, or modified" msgstr "Ce logiciel est open source et peut être copié, distribué ou modifié" msgid "Turbo Mode" -msgstr "Mode turbo" +msgstr "Mode Turbo" msgid "Turbo Mode Button" -msgstr "Bouton mode turbo" +msgstr "Bouton du Mode Turbo" msgid "Turkish" msgstr "Turc" @@ -679,9 +664,6 @@ msgstr "Périphérique de sauvegarde introuvable !" msgid "Unable to open state!" msgstr "Impossible d'ouvrir la sauvegarde d'état !" -msgid "Unfiltered" -msgstr "Non-filtré" - msgid "Unknown file type!" msgstr "Type de fichier inconnu !" @@ -701,19 +683,19 @@ msgid "UP" msgstr "HAUT" msgid "Up One Level" -msgstr "Dossier parent" +msgstr "Dossier Parent" msgid "USB drive not found!" msgstr "Aucun disque USB n'a été trouvé !" msgid "USB Mass Storage" -msgstr "Périphérique de stockage USB" +msgstr "Périphérique de Stockage USB" msgid "Video" msgstr "Vidéo" msgid "Video Mode" -msgstr "Mode vidéo" +msgstr "Mode Vidéo" msgid "Wiimote Orientation" msgstr "Orientation de la Wiimote" diff --git a/source/lang/it.lang b/source/lang/it.lang index b060aa1..8fb3f43 100644 --- a/source/lang/it.lang +++ b/source/lang/it.lang @@ -4,6 +4,9 @@ msgstr "&" msgid "16:9 Correction" msgstr "Correzione 16:9" +msgid "240p Output" +msgstr "Uscita 240p" + msgid "7z decompression failed: Archive contains too many files" msgstr "7z decompressione fallita: L'archivio contiene troppi file" @@ -67,6 +70,9 @@ msgstr "Automatico (Raccomandato)" msgid "B (Rapid)" msgstr "B (Rapido)" +msgid "Bilinear Filtering" +msgstr "Filtrando Bilineare" + msgid "Button Mapping" msgstr "Mappatura Pulsanti" @@ -112,18 +118,12 @@ msgstr "Cartella Cover" msgid "Credits" msgstr "Crediti" -msgid "Crosshair" -msgstr "Mirino" - msgid "Cursor" msgstr "Cursore" msgid "Data DVD" msgstr "DVD Dati" -msgid "Default" -msgstr "Predefinita" - msgid "Delete" msgstr "Eliminare" @@ -145,6 +145,9 @@ msgstr "Olandese" msgid "Empty or invalid ZIP file!" msgstr "File ZIP vuoto o non valido!" +msgid "Emulation Hacks" +msgstr "Hack di Emulazione" + msgid "English" msgstr "Inglese" @@ -181,9 +184,6 @@ msgstr "Esci" msgid "Exit Action" msgstr "Uscita" -msgid "Filtered" -msgstr "Filtrato" - msgid "Filtering" msgstr "Filtrando" @@ -205,9 +205,15 @@ msgstr "Impostazioni di Gioco - Mappature pulsanti" msgid "Game Settings - Cheats" msgstr "Impostazioni di Gioco - Cheat" +msgid "Game Settings - Emulation Hacks" +msgstr "Impostazioni di Gioco - Hack di Emulazione" + msgid "Game Settings - Video" msgstr "Impostazioni di Gioco - Video" +msgid "Gaussian (Default)" +msgstr "Gaussiana (Predefinita)" + msgid "German" msgstr "Tedesco" @@ -217,8 +223,8 @@ msgstr "Torna Indietro" msgid "Hide SRAM Saving" msgstr "Nascondi Salvataggio SRAM" -msgid "Hi Resolution" -msgstr "Alta Risoluzione" +msgid "Hi-Res Mode" +msgstr "Modalità Alta-Ris" msgid "Horizontal" msgstr "Orizzontale" @@ -226,9 +232,6 @@ msgstr "Orizzontale" msgid "Information" msgstr "Informazione" -msgid "Interpolation" -msgstr "Interpolazione" - msgid "Invalid file size!" msgstr "Dimensione del file non valida!" @@ -277,6 +280,9 @@ msgstr "SINISTRA" msgid "Left Button" msgstr "Pulsante Sinistro" +msgid "Linear" +msgstr "Lineare" + msgid "Load" msgstr "Carica" @@ -301,6 +307,9 @@ msgstr "Caricando patch..." msgid "Loading..." msgstr "Caricando..." +msgid "Low" +msgstr "Basso" + msgid "Main Menu" msgstr "Menù Principale" @@ -310,6 +319,9 @@ msgstr "Identico Controlli GC" msgid "Match Wii Controls" msgstr "Identico Controlli Wii" +msgid "Medium" +msgstr "Medio" + msgid "Menu" msgstr "Menù" @@ -328,15 +340,9 @@ msgstr "Muto" msgid "New" msgstr "Nuovo" -msgid "New Snapshot" -msgstr "Nuovo Snapshot" - msgid "New SRAM" msgstr "Nuova SRAM" -msgid "No data to save!" -msgstr "Nessun dato da salvare!" - msgid "No disc inserted!" msgstr "Disco non inserito!" @@ -349,9 +355,6 @@ msgstr "Nessun salvataggio trovato." msgid "None" msgstr "Nessuno" -msgid "Original" -msgstr "Originale" - msgid "Out of memory!" msgstr "Memoria esaurita!" @@ -409,9 +412,6 @@ msgstr "Terminare il gioco? Tutti i progressi saranno perduti." msgid "R TRIG" msgstr "TASTO R" -msgid "RAM saving is not available for FDS games!" -msgstr "Il salvataggio della RAM non è disponibile per i giochi FDS!" - msgid "Reset" msgstr "Resetta" @@ -469,14 +469,8 @@ msgstr "Cartella Salvataggio" msgid "Save Game" msgstr "Salvataggio" -msgid "Save RAM and State?" -msgstr "Salvare RAM e STATO?" - -msgid "Save Snapshot?" -msgstr "Salvare Snapshot?" - -msgid "Save SRAM and Snapshot?" -msgstr "Salvare SRAM e Snapshot?" +msgid "Save SRAM and State?" +msgstr "Salvare SRAM e STATO?" msgid "Save successful" msgstr "Salvato con successo" @@ -490,9 +484,6 @@ msgstr "Salvando le preferenze..." msgid "Saving..." msgstr "Salvando..." -msgid "Scaling" -msgstr "Scalettatura" - msgid "Screen Position" msgstr "Posizione Schermo" @@ -517,6 +508,9 @@ msgstr "Scheda SD" msgid "SD card not found!" msgstr "Scheda SD non trovata!" +msgid "Show Crosshair" +msgstr "Mostra Mirino" + msgid "Show Frame Rate" msgstr "Mostra FPS" @@ -532,11 +526,14 @@ msgstr "SNES Controller - Controller Tradizionale" msgid "Sound Effects Volume" msgstr "Volume Effetti Sonori" +msgid "Sound Interpolation" +msgstr "Interpolazione Sonora" + msgid "Spanish" msgstr "Spagnolo" msgid "Sprite Limit" -msgstr "Limite Sprite" +msgstr "Limite di Sprite" msgid "SRAM file not found" msgstr "File SRAM non trovato" @@ -550,9 +547,6 @@ msgstr "Stato (Auto)" msgid "State file not found" msgstr "File di stato non trovato" -msgid "Stereo Inversion" -msgstr "Inversione Stereo" - msgid "Super Scope" msgstr "Nintendo Scope" @@ -568,6 +562,9 @@ msgstr "Modalità Turbo" msgid "Turbo Mode Button" msgstr "Pulsante Turbo" +msgid "TV Mode" +msgstr "Modalità TV" + msgid "Unable to locate a load device!" msgstr "Impossibile localizzare una periferica di caricamento!" @@ -577,9 +574,6 @@ msgstr "Impossibile localizzare una periferica di salvataggio!" msgid "Unable to open state!" msgstr "Impossibile aprire lo stato!" -msgid "Unfiltered" -msgstr "Non filtrato!" - msgid "Unknown file type!" msgstr "Tipo di file sconosciuto!" diff --git a/source/lang/jp.lang b/source/lang/jp.lang index 1638934..8581d4a 100644 --- a/source/lang/jp.lang +++ b/source/lang/jp.lang @@ -4,6 +4,9 @@ msgstr "&" msgid "16:9 Correction" msgstr "16:9補正" +msgid "240p Output" +msgstr "240p出力" + msgid "7z decompression failed: Archive contains too many files" msgstr "書庫内のファイルが多すぎです" @@ -73,6 +76,9 @@ msgstr "自動(おすすめ)" msgid "B (Rapid)" msgstr "B (連打)" +msgid "Bilinear Filtering" +msgstr "バイリニアフィルタ" + msgid "Button Mapping" msgstr "ボタン設定" @@ -124,18 +130,12 @@ msgstr "カバーフォルダ" msgid "Credits" msgstr "提供･協力" -msgid "Crosshair" -msgstr "十字ボタン" - msgid "Cursor" msgstr "カーソル" msgid "Data DVD" msgstr "データDVD" -msgid "Default" -msgstr "初期値" - msgid "Delete" msgstr "消す" @@ -157,6 +157,9 @@ msgstr "ドイツ語" msgid "Empty or invalid ZIP file!" msgstr "不正なZIPファイルです" +msgid "Emulation Hacks" +msgstr "ハック" + msgid "English" msgstr "英語" @@ -193,9 +196,6 @@ msgstr "終了" msgid "Exit Action" msgstr "終了動作" -msgid "Filtered" -msgstr "フィルターする" - msgid "Filtering" msgstr "フィルタ" @@ -217,14 +217,17 @@ msgstr "ゲーム設定 - ボタン設定" msgid "Game Settings - Cheats" msgstr "ゲーム設定 - 改造コード" +msgid "Game Settings - Emulation Hacks" +msgstr "ゲーム設定 - ハック" + msgid "Game Settings - Video" msgstr "ゲーム設定 - 映像" msgid "GameCube Controller" msgstr "GCコントローラ" -msgid "Gaussian (SNES Hardware)" -msgstr "ガウシアン(SFCハードウェア)" +msgid "Gaussian (Default)" +msgstr "ガウシアン(初期値)" msgid "German" msgstr "ドイツ語" @@ -235,8 +238,8 @@ msgstr "戻る" msgid "Hide SRAM Saving" msgstr "SRAMセーブを隠す" -msgid "Hi Resolution" -msgstr "高解像度" +msgid "Hi-Res Mode" +msgstr "ハイレゾモード" msgid "Horizontal" msgstr "横方向" @@ -244,9 +247,6 @@ msgstr "横方向" msgid "Information" msgstr "情報" -msgid "Interpolation" -msgstr "内挿" - msgid "Invalid file size!" msgstr "不正なサイズです" @@ -322,6 +322,9 @@ msgstr "パッチを読み込み中…" msgid "Loading..." msgstr "読み込み中…" +msgid "Low" +msgstr "低" + msgid "Main Menu" msgstr "メインメニュー" @@ -331,9 +334,15 @@ msgstr "操作を最適化" msgid "Match Wii Controls" msgstr "操作を最適化" +msgid "Max" +msgstr "最大" + msgid "Maximum filepath length reached!" msgstr "ファイルのパスの限界まで行きました" +msgid "Medium" +msgstr "中程度" + msgid "Menu" msgstr "メニュー" @@ -352,18 +361,12 @@ msgstr "消音" msgid "New" msgstr "新しい" -msgid "New Snapshot" -msgstr "新しい中断データ" - msgid "New SRAM" msgstr "新しいSRAM" msgid "No" msgstr "いいえ" -msgid "No data to save!" -msgstr "セーブするデータがありません" - msgid "No disc inserted!" msgstr "ディスクが挿入されていません" @@ -385,11 +388,14 @@ msgstr "ヌンチャク" msgid "Off" msgstr "オフ" +msgid "OFF" +msgstr "オフ" + msgid "On" msgstr "オン" -msgid "Original" -msgstr "オリジナル" +msgid "ON" +msgstr "オン" msgid "Out of memory!" msgstr "メモリが足りません" @@ -451,15 +457,9 @@ msgstr "未保存のデータは失われます" msgid "R TRIG" msgstr "Rトリガー" -msgid "RAM saving is not available for FDS games!" -msgstr "ディスクシステムにはRAMセーブはありません" - msgid "Reboot" msgstr "再起動" -msgid "Rendering" -msgstr "描画" - msgid "Reset" msgstr "リセット" @@ -496,6 +496,9 @@ msgstr "右ボタン" msgid "Right Stick (Default)" msgstr "右スティック（初期値）" +msgid "Satellaview" +msgstr "サテラビュー" + msgid "Save" msgstr "セーブ" @@ -514,14 +517,8 @@ msgstr "セーブフォルダ" msgid "Save Game" msgstr "セーブデータをセーブ" -msgid "Save RAM and State?" -msgstr "RAMと状態をセーブしますか?" - -msgid "Save Snapshot?" -msgstr "中断データをセーブしますか?" - -msgid "Save SRAM and Snapshot?" -msgstr "SRAMと中断データをセーブしますか?" +msgid "Save SRAM and State?" +msgstr "SRAMと状態をセーブしますか?" msgid "Save State?" msgstr "状態をセーブしますか?" @@ -538,9 +535,6 @@ msgstr "優先的にセーブ中…" msgid "Saving..." msgstr "セーブ中…" -msgid "Scaling" -msgstr "縮尺" - msgid "Screenshots" msgstr "スクリーンショット" @@ -568,15 +562,12 @@ msgstr "SD" msgid "SD card not found!" msgstr "SDが見つかりません" +msgid "Show Crosshair" +msgstr "十字線を表示" + msgid "Show Frame Rate" msgstr "表示フレーム率" -msgid "Snapshot" -msgstr "中断データ" - -msgid "Snapshot (Auto)" -msgstr "中断データ(自動)" - msgid "SNES Controller" msgstr "コントローラ" @@ -613,6 +604,9 @@ msgstr "Snes9x - 著作権(c) Snes9xチーム1996-2022" msgid "Sound Effects Volume" msgstr "効果音の音量" +msgid "Sound Interpolation" +msgstr "サウンド補間" + msgid "Spanish" msgstr "スペイン語" @@ -634,9 +628,6 @@ msgstr "状態(自動)" msgid "State file not found" msgstr "状態ファイルが見つかりません" -msgid "Stereo Inversion" -msgstr "ステレオ反転" - msgid "Super Scope" msgstr "ｽｰﾊﾟｰｽｺｰﾌﾟ" @@ -652,6 +643,9 @@ msgstr "ターボモード" msgid "Turbo Mode Button" msgstr "ターボモードボタン" +msgid "TV Mode" +msgstr "TVモード" + msgid "Unable to locate a load device!" msgstr "デバイスを見つけられませんでした" @@ -661,9 +655,6 @@ msgstr "デバイスを見つけられませんでした" msgid "Unable to open state!" msgstr "中断データを開けませんでした" -msgid "Unfiltered" -msgstr "フィルタ無し" - msgid "Unknown file type!" msgstr "不明なファイル形式です" diff --git a/source/lang/ko.lang b/source/lang/ko.lang index 710970f..2988a57 100644 --- a/source/lang/ko.lang +++ b/source/lang/ko.lang @@ -4,6 +4,9 @@ msgstr "" msgid "16:9 Correction" msgstr "16:9 수정" +msgid "240p Output" +msgstr "240p 출력" + msgid "7z decompression failed: Archive contains too many files." msgstr "7z 압축 해제 실패: 압축 파일에 너무 많은 파일이 포함되었습니다." @@ -64,6 +67,9 @@ msgstr "자동 (추천)" msgid "Back" msgstr "뒤로" +msgid "Bilinear Filtering" +msgstr "쌍선형 필터링" + msgid "Brazilian Portuguese" msgstr "브라질 포루투갈어" @@ -112,15 +118,15 @@ msgstr "커버" msgid "Covers Folder" msgstr "커버 폴더" +msgid "CPU Overclocking" +msgstr "CPU 오버클럭" + msgid "Credits" msgstr "크레딧" msgid "Data DVD" msgstr "데이터 DVD" -msgid "Default" -msgstr "기본값" - msgid "Delete" msgstr "삭제하기" @@ -148,6 +154,9 @@ msgstr "아래쪽" msgid "Dutch" msgstr "네덜란드어" +msgid "Emulation Hacks" +msgstr "에뮬레이션 해킹" + msgid "English" msgstr "영어" @@ -193,12 +202,18 @@ msgstr "프랑스어" msgid "Game Settings" msgstr "게임 설정" +msgid "Game Settings - Audio" +msgstr "게임 설정 - 오디오" + msgid "Game Settings - Button Mappings" msgstr "게임 설정 - 버튼 맵핑" msgid "Game Settings - Cheats" msgstr "게임 설정 - 치트" +msgid "Game Settings - Emulation Hacks" +msgstr "게임 설정 - 에뮬레이션 해킹" + msgid "Game Settings - Video" msgstr "게임 설정 - 비디오" @@ -214,8 +229,8 @@ msgstr "뒤로 가기" msgid "Hide SRAM Saving" msgstr "숨기기 저장 SRAM" -msgid "Hi Resolution" -msgstr "높은 해상도" +msgid "Hi-Res Mode" +msgstr "고해상도 모드" msgid "Horizontal" msgstr "수평" @@ -262,12 +277,21 @@ msgstr "DVD 불러오기 중..." msgid "Loading..." msgstr "불러오기 중..." +msgid "Low" +msgstr "낮은" + msgid "Main Menu" msgstr "메인 메뉴" +msgid "Max" +msgstr "최대" + msgid "Maximum filepath length reached!" msgstr "최대 파일경로 길이입니다!" +msgid "Medium" +msgstr "중간" + msgid "Menu" msgstr "메뉴" @@ -307,9 +331,6 @@ msgstr "확인" msgid "On" msgstr "켬" -msgid "Original" -msgstr "오리지널" - msgid "Out of memory: too many files!" msgstr "메모리 부족: 너무 많은 파일!" @@ -364,9 +385,6 @@ msgstr "이 게임을 종료하겠습니까? 저장되지 않는 진행은 손 msgid "Reboot" msgstr "재부팅" -msgid "Rendering" -msgstr "렌더링" - msgid "Reset" msgstr "리셋" @@ -427,9 +445,6 @@ msgstr "환경 설정 저장 중..." msgid "Saving..." msgstr "저장 중..." -msgid "Scaling" -msgstr "스케일" - msgid "Screen Position" msgstr "화면 위치" @@ -472,6 +487,9 @@ msgstr "시프트" msgid "Sound Effects Volume" msgstr "사운드 효과 볼륨" +msgid "Sound Interpolation" +msgstr "사운드 보간" + msgid "Spanish" msgstr "스페인어" @@ -484,9 +502,6 @@ msgstr "시작" msgid "State" msgstr "상태" -msgid "Stereo Inversion" -msgstr "스테레오 반전" - msgid "The current IOS has been altered (fake-signed). Functionality and/or stability may be adversely affected." msgstr "현재 IOS는 (가짜 서명) 변경되었습니다. 기능 및 안정성에 부정적인 영향을 줄 수 있습니다" @@ -502,15 +517,15 @@ msgstr "터보 모드 버튼" msgid "Turkish" msgstr "터키어" +msgid "TV Mode" +msgstr "TV 모드" + msgid "Unable to locate a load device!" msgstr "불러온 장치를 찾을 수 없습니다!" msgid "Unable to locate a save device!" msgstr "저장 장치를 찾을 수 없습니다!" -msgid "Unfiltered" -msgstr "필터링되지 않음" - msgid "Unrecognized DVD format." msgstr "인식할 수 없는 DVD 형식입니다." @@ -565,29 +580,17 @@ msgstr "오디오" msgid "Coding" msgstr "코딩" -msgid "Crosshair" -msgstr "십자 버튼" - msgid "Cursor" msgstr "커서" -msgid "Filtered" -msgstr "필터" - msgid "Filtering" msgstr "필터링" msgid "Fire" msgstr "발사" -msgid "Game Settings - Audio" -msgstr "게임 설정 - 오디오" - -msgid "Gaussian (SNES Hardware)" -msgstr "가우스 (SNES 하드웨어)" - -msgid "Interpolation" -msgstr "보간법" +msgid "Gaussian (Default)" +msgstr "가우스 (기본값)" msgid "Justifier" msgstr "광선총" @@ -604,18 +607,30 @@ msgstr "저장된 SRAM 데이터가 없습니다!" msgid "None" msgstr "없음" +msgid "OFF" +msgstr "끔" + +msgid "ON" +msgstr "켬" + msgid "Progressive (480p)" msgstr "프로그레시브 (480p)" msgid "Right Button" msgstr "오른쪽 버튼" +msgid "Satellaview" +msgstr "사테라뷰" + msgid "Save failed!" msgstr "저장 실패!" msgid "Save SRAM and State?" msgstr "SRAM과 상태를 저장하겠습니까?" +msgid "Show Crosshair" +msgstr "십자선 보기" + msgid "Show Frame Rate" msgstr "프레임속도 보기" @@ -649,7 +664,7 @@ msgstr "슈퍼 스코프 - 게임큐브 컨트롤러" msgid "Super Scope - Wiimote" msgstr "슈퍼 스코프 - 위모트" -msgid "SuperFX Overclock" +msgid "SuperFX Overclocking" msgstr "슈퍼FX 오버클럭" msgid "This software is open source and may be copied, distributed, or modified" diff --git a/source/lang/nl.lang b/source/lang/nl.lang index 741594b..5a03bd5 100644 --- a/source/lang/nl.lang +++ b/source/lang/nl.lang @@ -2,7 +2,10 @@ msgid "&" msgstr "&" msgid "16:9 Correction" -msgstr 16:9 Correctie" +msgstr "16:9 Correctie" + +msgid "240p Output" +msgstr "240p Uitgang" msgid "7z decompression failed: Archive contains too many files" msgstr "7z uitpakken mislukt: te veel bestanden in het archief" @@ -64,6 +67,9 @@ msgstr "B (Snel)" msgid "Back" msgstr "Terug" +msgid "Bilinear Filtering" +msgstr "Bilineaire Filteren" + msgid "Button Mapping" msgstr "Controller Instelling" @@ -103,12 +109,12 @@ msgstr "Omslag Weergave" msgid "Covers Folder" msgstr "Omslagmap" +msgid "CPU Overclocking" +msgstr "CPU Overklokken" + msgid "Data DVD" msgstr "DVD-ROM" -msgid "Default" -msgstr "Standaard" - msgid "Delete" msgstr "Verwijderen" @@ -130,6 +136,9 @@ msgstr "Nederlands" msgid "Empty or invalid ZIP file!" msgstr "Leeg of beschadigd ZIP bestand!" +msgid "Emulation Hacks" +msgstr "Emulatie Hacks" + msgid "English" msgstr "Engels" @@ -166,9 +175,6 @@ msgstr "Afsluiten" msgid "Exit Action" msgstr "Actie afsluiten" -msgid "Filtered" -msgstr "Gefilterd" - msgid "Filtering" msgstr "Filteren" @@ -181,15 +187,24 @@ msgstr "Frans" msgid "Game Settings" msgstr "Spelinstellingen" +msgid "Game Settings - Audio" +msgstr "Spelinstellingen - Audio" + msgid "Game Settings - Button Mappings" msgstr "Spelinstellingen - Controller Configuratie" msgid "Game Settings - Cheats" msgstr "Spelinstellingen - Cheats" +msgid "Game Settings - Emulation Hacks" +msgstr "Spelinstellingen - Emulatie Hacks" + msgid "Game Settings - Video" msgstr "Spelinstellingen - Video" +msgid "Gaussian (Default)" +msgstr "Gaussiaans (Standaard)" + msgid "German" msgstr "Duits" @@ -199,8 +214,8 @@ msgstr "Ga Terug" msgid "Hide SRAM Saving" msgstr "Verberg SRAM-sparen" -msgid "Hi Resolution" -msgstr "Hoge Resolutie" +msgid "Hi-Res Mode" +msgstr "Hi-Res Modus" msgid "Horizontal" msgstr "Horizontaal" @@ -208,9 +223,6 @@ msgstr "Horizontaal" msgid "Information" msgstr "Informatie" -msgid "Interpolation" -msgstr "Interpolatie" - msgid "Invalid file size!" msgstr "Verkeerde bestandsgrootte!" @@ -250,6 +262,9 @@ msgstr "LINKS" msgid "Left Button" msgstr "Knop Links" +msgid "Linear" +msgstr "Lineair" + msgid "Load" msgstr "Openen" @@ -274,6 +289,9 @@ msgstr "Bezig met patch laden..." msgid "Loading..." msgstr "Bezig met laden..." +msgid "Low" +msgstr "Laag" + msgid "Main Menu" msgstr "Hoofdmenu" @@ -298,18 +316,12 @@ msgstr "Stil" msgid "New" msgstr "Nieuw" -msgid "New Snapshot" -msgstr "Nieuw Snapshot" - msgid "New SRAM" msgstr "Nieuw SRAM" msgid "No" msgstr "Nee" -msgid "No data to save!" -msgstr "Geen data om op te slaan!" - msgid "No disc inserted!" msgstr "Geen schijf ingevoerd!" @@ -325,11 +337,14 @@ msgstr "Geen" msgid "Off" msgstr "Uit" +msgid "OFF" +msgstr "UIT" + msgid "On" msgstr "Aan" -msgid "Original" -msgstr "Origineel" +msgid "ON" +msgstr "AAN" msgid "Out of memory!" msgstr "Te weinig geheugen!" @@ -382,15 +397,9 @@ msgstr "Spel stoppen? Niet opgeslagen gegevens zullen verloren gaan." msgid "R TRIG" msgstr "R" -msgid "RAM saving is not available for FDS games!" -msgstr "RAM opslaan is niet beschikbaar voor FDS spellen!" - msgid "Reboot" msgstr "Herstart" -msgid "Rendering" -msgstr "Renderen" - msgid "Reset" msgstr "Herstart" @@ -445,15 +454,9 @@ msgstr "Opslaan Map" msgid "Save Game" msgstr "Spel Opslaan" -msgid "Save RAM and State?" +msgid "Save SRAM and State?" msgstr "Geheugen en status opslaan?" -msgid "Save Snapshot?" -msgstr "Snapshot Opslaan?" - -msgid "Save SRAM and Snapshot?" -msgstr "SRAM en Snapshot opslaan?" - msgid "Save State?" msgstr "Status Opslaan?" @@ -469,9 +472,6 @@ msgstr "Instellingen opslaan..." msgid "Saving..." msgstr "Bezig met opslaan..." -msgid "Scaling" -msgstr "Schaal" - msgid "Screen Position" msgstr "Schermpositie" @@ -496,6 +496,9 @@ msgstr "SD Kaart" msgid "SD card not found!" msgstr "Geen SD kaart gevonden!" +msgid "Show Crosshair" +msgstr "Toon Dradenkruis" + msgid "Show Frame Rate" msgstr "Toon Framerate" @@ -511,6 +514,9 @@ msgstr "SNES Muis - Wiimote" msgid "Sound Effects Volume" msgstr "Volume Geluidseffecten" +msgid "Sound Interpolation" +msgstr "Geluidsinterpolatie" + msgid "Spanish" msgstr "Spaans" @@ -529,8 +535,8 @@ msgstr "Status (Auto)" msgid "State file not found" msgstr "Status bestand niet gevonden" -msgid "Stereo Inversion" -msgstr "Stereo-inversie" +msgid "SuperFX Overclocking" +msgstr "SuperFX Overklokken" msgid "Super Scope" msgstr "Nintendo Scope" @@ -545,7 +551,10 @@ msgid "Turbo Mode" msgstr "Turbo Modus" msgid "Turbo Mode Button" -msgstr "Turbo Modus-Knop" +msgstr "Turbo Modus Knop" + +msgid "TV Mode" +msgstr "TV Modus" msgid "Unable to locate a load device!" msgstr "Kan laadapparaat niet vinden!" @@ -556,9 +565,6 @@ msgstr "Kan opslagapparaat niet vinden!" msgid "Unable to open state!" msgstr "Kan status niet openen!" -msgid "Unfiltered" -msgstr "Ongefiltered" - msgid "Unknown file type!" msgstr "Onbekend bestandstype!" diff --git a/source/lang/pt.lang b/source/lang/pt.lang index d8e437e..c2d350a 100644 --- a/source/lang/pt.lang +++ b/source/lang/pt.lang @@ -4,6 +4,9 @@ msgstr "&" msgid "16:9 Correction" msgstr "Correcção 16:9" +msgid "240p Output" +msgstr "Saída 240p" + msgid "7z decompression failed: Archive contains too many files" msgstr "Extracção 7z falhou: o ficheiro 7z contém demasiados ficheiros" @@ -73,6 +76,9 @@ msgstr "B (Rápido)" msgid "Back" msgstr "Voltar" +msgid "Bilinear Filtering" +msgstr "Filtragem Bilinear" + msgid "Button Mappings" msgstr "Mapear Botões" @@ -121,15 +127,9 @@ msgstr "Pasta de Capas" msgid "Credits" msgstr "Créditos" -msgid "Crosshair" -msgstr "Mira" - msgid "Data DVD" msgstr "DVD de Dados" -msgid "Default" -msgstr "Padrão" - msgid "Delete" msgstr "Deletar" @@ -151,6 +151,9 @@ msgstr "Holandês" msgid "Empty or invalid ZIP file!" msgstr "Ficheiro ZIP vazio ou inválido" +msgid "Emulation Hacks" +msgstr "Emulação Hacks" + msgid "English" msgstr "Inglês" @@ -187,9 +190,6 @@ msgstr "Sair" msgid "Exit Action" msgstr "Acção ao Sair" -msgid "Filtered" -msgstr "Filtrado" - msgid "Filtering" msgstr "Filtragem" @@ -211,12 +211,18 @@ msgstr "Configurações - Mapear Botões" msgid "Game Settings - Cheats" msgstr "Configurações - Truques" +msgid "Game Settings - Emulation Hacks" +msgstr "Configurações - Emulação Hacks" + msgid "Game Settings - Video" msgstr "Configurações - Vídeo" msgid "GameCube Controller" msgstr "Comando GameCube" +msgid "Gaussian (Default)" +msgstr "Gaussiana (Padrão)" + msgid "German" msgstr "Alemão" @@ -226,15 +232,12 @@ msgstr "Voltar" msgid "Hide SRAM Saving" msgstr "Ocultar gravar SRAM" -msgid "Hi Resolution" -msgstr "Alta Resolução" +msgid "Hi-Res Mode" +msgstr "Modo Alta-Res" msgid "Information" msgstr "Informação" -msgid "Interpolation" -msgstr "Interpolação" - msgid "Invalid file size!" msgstr "Tamanho de ficheiro inválido!" @@ -304,6 +307,9 @@ msgstr "A Carregar patch..." msgid "Loading..." msgstr "A carregar..." +msgid "Low" +msgstr "Baixo" + msgid "Main Menu" msgstr "Menu Principal" @@ -313,9 +319,15 @@ msgstr "Coincidir Controlos GC" msgid "Match Wii Controls" msgstr "Coincidir Controlos Wii" +msgid "Max" +msgstr "Máximo" + msgid "Maximum filepath length reached!" msgstr "Tamanho máximo do caminho do ficheiro alcançado!" +msgid "Medium" +msgstr "Médio" + msgid "Menu artwork" msgstr "Arte do Menu" @@ -331,18 +343,12 @@ msgstr "Mudo" msgid "New" msgstr "Novo" -msgid "New Snapshot" -msgstr "Novo Snapshot" - msgid "New SRAM" msgstr "Nova SRAM" msgid "No" msgstr "Não" -msgid "No data to save!" -msgstr "Não há dados para gravar!" - msgid "No disc inserted!" msgstr "Nenhum disco inserido!" @@ -358,9 +364,15 @@ msgstr "Nenhum" msgid "Off" msgstr "Desligado" +msgid "OFF" +msgstr "DESLIGADO" + msgid "On" msgstr "Ligado" +msgid "ON" +msgstr "LIGADO" + msgid "Out of memory!" msgstr "Memória insuficiente!" @@ -427,15 +439,9 @@ msgstr "Sair do Jogo? Qualquer progresso não gravado será perdido." msgid "R TRIG" msgstr "R" -msgid "RAM saving is not available for FDS games!" -msgstr "Gravar RAM não está disponível para jogos do FDS (Famicom Disk System)!" - msgid "Reboot" msgstr "Reiniciar" -msgid "Rendering" -msgstr "Renderização" - msgid "Reset" msgstr "Reiniciar" @@ -490,14 +496,8 @@ msgstr "Pasta de gravar" msgid "Save Game" msgstr "Gravar Jogo" -msgid "Save RAM and State?" -msgstr "Gravar RAM e o estado?" - -msgid "Save Snapshot?" -msgstr "Gravar Snapshot?" - -msgid "Save SRAM and Snapshot?" -msgstr "Gravar SRAM e Snapshot?" +msgid "Save SRAM and State?" +msgstr "Gravar SRAM e o estado?" msgid "Save State?" msgstr "Gravar estado?" @@ -514,9 +514,6 @@ msgstr "A gravar preferências..." msgid "Saving..." msgstr "A gravar..." -msgid "Scaling" -msgstr "Escala" - msgid "Screen Position" msgstr "Posição do Ecrã" @@ -541,6 +538,9 @@ msgstr "Cartão SD" msgid "SD card not found!" msgstr "Cartão SD não encontrado!" +msgid "Show Crosshair" +msgstr "Mostrar Mira" + msgid "Show Frame Rate" msgstr "Mostrar FPS" @@ -580,11 +580,14 @@ msgstr "Snes9x - Direitos de autor (c) Equipa Snes9x 1996 - 2022" msgid "Sound Effects Volume" msgstr "Volume de Efeitos Sonoros" +msgid "Sound Interpolation" +msgstr "Interpolação de Som" + msgid "Spanish" msgstr "Espanhol" msgid "Sprite Limit" -msgstr "Limite de Sprites" +msgstr "Limite de Sprite" msgid "SRAM file not found" msgstr "Ficheiro SRAM não encontrado" @@ -598,9 +601,6 @@ msgstr "Estado (Auto)" msgid "State file not found" msgstr "Ficheiro de estado não encontrado" -msgid "Stereo Inversion" -msgstr "Inversão Estéreo" - msgid "Super Scope" msgstr "Nintendo Scope" @@ -616,6 +616,9 @@ msgstr "Modo Turbo" msgid "Turbo Mode Button" msgstr "Botão Modo Turbo" +msgid "TV Mode" +msgstr "Modo TV" + msgid "Unable to locate a load device!" msgstr "Dispositivo de carregamento não encontrado!" @@ -625,9 +628,6 @@ msgstr "Dispositivo de gravar não encontrado!" msgid "Unable to open state!" msgstr "Não foi possível abrir estado!" -msgid "Unfiltered" -msgstr "Sem Filtro" - msgid "Unknown file type!" msgstr "Tipo de ficheiro desconhecido!" diff --git a/source/lang/pt_br.lang b/source/lang/pt_br.lang index 4ab185f..7d4164e 100644 --- a/source/lang/pt_br.lang +++ b/source/lang/pt_br.lang @@ -4,6 +4,9 @@ msgstr "&" msgid "16:9 Correction" msgstr "Correção 16:9" +msgid "240p Output" +msgstr "Saída 240p" + msgid "7z decompression failed: Archive contains too many files" msgstr "Falha na descompressão 7z: Arquivo contém arquivos demais" @@ -73,6 +76,9 @@ msgstr "B (Rápido)" msgid "Back" msgstr "Voltar" +msgid "Bilinear Filtering" +msgstr "Filtragem Bilinear" + msgid "Brazilian Portuguese" msgstr "Português do Brasil" @@ -124,15 +130,9 @@ msgstr "Pasta de Capas" msgid "Credits" msgstr "Créditos" -msgid "Crosshair" -msgstr "Mira" - msgid "Data DVD" msgstr "DVD de Dados" -msgid "Default" -msgstr "Padrão" - msgid "Delete" msgstr "Deletar" @@ -163,6 +163,9 @@ msgstr "Holandês" msgid "Empty or invalid ZIP file!" msgstr "Arquivo ZIP vazio ou inválido!" +msgid "Emulation Hacks" +msgstr "Emulação Hacks" + msgid "English" msgstr "Inglês" @@ -199,9 +202,6 @@ msgstr "Sair" msgid "Exit Action" msgstr "Ação ao Sair" -msgid "Filtered" -msgstr "Filtrado" - msgid "Filtering" msgstr "Filtragem" @@ -226,12 +226,18 @@ msgstr "Configurações - Mapeamento dos Botões" msgid "Game Settings - Cheats" msgstr "Configurações - Trapaças" +msgid "Game Settings - Emulation Hacks" +msgstr "Configurações - Emulação Hacks" + msgid "Game Settings - Video" msgstr "Configurações - Vídeo" msgid "GameCube Controller" msgstr "Controle do GameCube" +msgid "Gaussian (Default)" +msgstr "Gaussiana (Padrão)" + msgid "German" msgstr "Alemão" @@ -241,15 +247,12 @@ msgstr "Voltar" msgid "Hide SRAM Saving" msgstr "Ocultar Salvar SRAM" -msgid "Hi Resolution" -msgstr "Alta Resolução" +msgid "Hi-Res Mode" +msgstr "Modo Alta-Res" msgid "Information" msgstr "Informação" -msgid "Interpolation" -msgstr "Interpolação" - msgid "Invalid file size!" msgstr "Tamanho do arquivo é inválido!" @@ -316,6 +319,9 @@ msgstr "Carregando Patch..." msgid "Loading..." msgstr "Carregando..." +msgid "Low" +msgstr "Baixo" + msgid "Main Menu" msgstr "Menu Principal" @@ -325,9 +331,15 @@ msgstr "Igualar aos Controles do GameCube" msgid "Match Wii Controls" msgstr "Igualar aos Controles do Wii" +msgid "Max" +msgstr "Máximo" + msgid "Maximum filepath length reached!" msgstr "Tamanho máximo do caminho de arquivo alcançado!" +msgid "Medium" +msgstr "Médio" + msgid "Menu artwork" msgstr "Ilustrações do Menu" @@ -343,18 +355,12 @@ msgstr "Mudo" msgid "New" msgstr "Novo" -msgid "New Snapshot" -msgstr "Nova Snapshop" - msgid "New SRAM" msgstr "Novo SRAM" msgid "No" msgstr "Não" -msgid "No data to save!" -msgstr "Sem dados para salvar!" - msgid "No disc inserted!" msgstr "Sem disco inserido!" @@ -424,15 +430,9 @@ msgstr "Quer mesmo sair desse jogo? Qualquer progresso não-salvo será perdido. msgid "R TRIG" msgstr "R" -msgid "RAM saving is not available for FDS games!" -msgstr "Salvar em RAM não está disponível para jogos FDS (Famicom Disk System)!" - msgid "Reboot" msgstr "Reiniciar" -msgid "Rendering" -msgstr "Renderização" - msgid "Reset" msgstr "Resetar" @@ -490,14 +490,8 @@ msgstr "Pasta de Jogo salvo" msgid "Save Game" msgstr "Salvar o Jogo" -msgid "Save RAM and State?" -msgstr "Salvar em RAM e State? " - -msgid "Save Snapshot?" -msgstr "Salvar Snapshot?" - -msgid "Save SRAM and Snapshot?" -msgstr "Salvar em SRAM e Snapshot?" +msgid "Save SRAM and State?" +msgstr "Salvar em SRAM e State?" msgid "Save State?" msgstr "Salvar State?" @@ -514,9 +508,6 @@ msgstr "Salvando as configurações..." msgid "Saving..." msgstr "Salvando..." -msgid "Scaling" -msgstr "Formato" - msgid "Screen Position" msgstr "Posição da Tela" @@ -553,15 +544,12 @@ msgstr "Configurações - Salvar & Carregar" msgid "Shift" msgstr "Maius." +msgid "Show Crosshair" +msgstr "Mostrar Mira" + msgid "Show Frame Rate" msgstr "Mostrar FPS" -msgid "Snapshot" -msgstr "Posição Salva" - -msgid "Snapshot (auto)" -msgstr "Posição Salva (auto)" - msgid "SNES Controller" msgstr "Controle do Super Nintendo" @@ -595,11 +583,14 @@ msgstr "Mouse do Super Nintendo - WiiMote" msgid "Sound Effects Volume" msgstr "Volume dos Efeitos Sonoros" +msgid "Sound Interpolation" +msgstr "Interpolação Sonora" + msgid "Spanish" msgstr "Espanhol" msgid "Sprite Limit" -msgstr "Limite de Sprites" +msgstr "Limite de Sprite" msgid "SRAM file not found" msgstr "Arquivo SRAM não foi encontrado" @@ -607,12 +598,6 @@ msgstr "Arquivo SRAM não foi encontrado" msgid "State file not found" msgstr "Arquivo de State não foi encontrado" -msgid "Stereo Inversion" -msgstr "Inversão Estéreo" - -msgid "SuperFX Overclock" -msgstr "Overclock SuperFX" - msgid "Super Scope - GameCube Controller" msgstr "Super Scope - Controle do GameCube" @@ -643,6 +628,9 @@ msgstr "Turbo Ativado" msgid "Turkish" msgstr "Turco" +msgid "TV Mode" +msgstr "Modo TV" + msgid "Unable to locate a load device!" msgstr "Não foi possível localizar o dispositivo de carregamento!" @@ -652,9 +640,6 @@ msgstr "Não foi possível localizar o dispositivo de jogo salvo!" msgid "Unable to open state!" msgstr "Não foi possível carregar a state!" -msgid "Unfiltered" -msgstr "Sem Filtro" - msgid "Unknown file type!" msgstr "Tipo de arquivo desconhecido!" diff --git a/source/lang/tr.lang b/source/lang/tr.lang index 7a6e78a..83a0bc5 100644 --- a/source/lang/tr.lang +++ b/source/lang/tr.lang @@ -4,6 +4,9 @@ msgstr "&" msgid "16:9 Correction" msgstr "16:9 Düzeltmesi" +msgid "240p Output" +msgstr "240p Çıkış" + msgid "7z decompression failed: Archive contains too many files" msgstr "7z dosya çıkarma başarısız: Arşiv çok fazla dosya içeriyor" @@ -46,6 +49,9 @@ msgstr "Yükleme aygıtı belirlenmeye çalışılıyor..." msgid "Attempting to determine save device..." msgstr "Kayıt aygıtı belirlenmeye çalışılıyor..." +msgid "Audio" +msgstr "Ses" + msgid "Auto" msgstr "Otomatik" @@ -70,6 +76,9 @@ msgstr "B (Seri)" msgid "Back" msgstr "Sil" +msgid "Bilinear Filtering" +msgstr "Bilineer Filtreleme" + msgid "Button Mapping" msgstr "Buton Ayarı" @@ -118,21 +127,18 @@ msgstr "Kapak" msgid "Covers Folder" msgstr "Kapak Dizini" +msgid "CPU Overclocking" +msgstr "CPU Hız Aşırtma" + msgid "Credits" msgstr "Hakkında" -msgid "Crosshair" -msgstr "Artı İmleci" - msgid "Cursor" msgstr "İmleç" msgid "Data DVD" msgstr "Veri DVD'si" -msgid "Default" -msgstr "Varsayılan" - msgid "Delete" msgstr "Silmek" @@ -154,6 +160,9 @@ msgstr "Flemenkçe" msgid "Empty or invalid ZIP file!" msgstr "Boş veya geçersiz ZIP dosyası!" +msgid "Emulation Hacks" +msgstr "Emülasyon Hacks" + msgid "English" msgstr "İngilizce" @@ -190,9 +199,6 @@ msgstr "Çıkış" msgid "Exit Action" msgstr "Çıkış Eylemi" -msgid "Filtered" -msgstr "Filtre Var" - msgid "Filtering" msgstr "Filtreleme" @@ -205,18 +211,27 @@ msgstr "Fransızca" msgid "Game Settings" msgstr "Oyun Ayarları" +msgid "Game Settings - Audio" +msgstr "Oyun Ayarları - Ses" + msgid "Game Settings - Button Mappings" msgstr "Oyun Ayarları - Buton Ayarları" msgid "Game Settings - Cheats" msgstr "Oyun Ayarları - Hileler" +msgid "Game Settings - Emulation Hacks" +msgstr "Oyun Ayarları - Emülasyon Hacks" + msgid "Game Settings - Video" msgstr "Oyun Ayarları - Ekran" msgid "GameCube Controller" msgstr "GameCube Oyun Kumandası" +msgid "Gaussian (Default)" +msgstr "Gauss (Varsayılan)" + msgid "German" msgstr "Almanca" @@ -226,8 +241,8 @@ msgstr "Geri Dön" msgid "Hide SRAM Saving" msgstr "SRAM kayıt gizle" -msgid "Hi Resolution" -msgstr "Yüksek Çözünürlük" +msgid "Hi-Res Mode" +msgstr "Hi-Res Modu" msgid "Horizontal" msgstr "Yatay" @@ -235,9 +250,6 @@ msgstr "Yatay" msgid "Information" msgstr "Bilgi" -msgid "Interpolation" -msgstr "İnterpolasyon" - msgid "Invalid file size!" msgstr "Geçersiz dosya boyutu!" @@ -283,6 +295,9 @@ msgstr "SOL" msgid "Left Button" msgstr "Sol Buton" +msgid "Linear" +msgstr "Doğrusal" + msgid "Load" msgstr "Yükle" @@ -307,6 +322,9 @@ msgstr "Yama dosyası yükleniyor..." msgid "Loading..." msgstr "Yükleniyor..." +msgid "Low" +msgstr "Düşük" + msgid "Main Menu" msgstr "Ana Menü" @@ -319,6 +337,9 @@ msgstr "Wii Kumandalarına Eşleştir" msgid "Maximum filepath length reached!" msgstr "Maksimum dizin yolu uzunluğuna ulaşıldı!" +msgid "Medium" +msgstr "Orta" + msgid "Menu" msgstr "Menü" @@ -337,18 +358,12 @@ msgstr "Sessiz" msgid "New" msgstr "Yeni" -msgid "New Snapshot" -msgstr "Yeni Enstantane" - msgid "New SRAM" msgstr "Yeni SRAM" msgid "No" msgstr "Hayır" -msgid "No data to save!" -msgstr "Kaydedilecek veri yok!" - msgid "No disc inserted!" msgstr "Disk takılmamış!" @@ -364,14 +379,17 @@ msgstr "Yok" msgid "Off" msgstr "Kapalı" +msgid "OFF" +msgstr "Kapalı" + msgid "OK" msgstr "Tamam" msgid "On" msgstr "Açık" -msgid "Original" -msgstr "Orijinal" +msgid "ON" +msgstr "Açık" msgid "Out of memory!" msgstr "Bellek yetersiz!" @@ -427,9 +445,6 @@ msgstr "Oyundan çıkılsın mı? Kaydedilmemiş tüm veriler kaybolacak." msgid "R TRIG" msgstr "R Mandalı" -msgid "RAM saving is not available for FDS games!" -msgstr "RAM kaydetme FDS oyunları için mevcut değil!" - msgid "Reboot" msgstr "Yeniden Başlat" @@ -487,14 +502,8 @@ msgstr "Kayıt Dizini" msgid "Save Game" msgstr "Oyunu Kaydet" -msgid "Save RAM and State?" -msgstr "RAM ve Durum Kaydedilsin mi?" - -msgid "Save Snapshot?" -msgstr "Enstantane Kaydedilsin mi?" - -msgid "Save SRAM and Snapshot?" -msgstr "SRAM ve Enstantane Kaydedilsin mi?" +msgid "Save SRAM and State?" +msgstr "SRAM ve Durum Kaydedilsin mi?" msgid "Save State?" msgstr "Durum kaydedilsin mi?" @@ -511,9 +520,6 @@ msgstr "Ayarlar kaydediliyor..." msgid "Saving..." msgstr "Kaydediliyor..." -msgid "Scaling" -msgstr "Ölçekleme" - msgid "Screen Position" msgstr "Ekran Konumu" @@ -535,15 +541,12 @@ msgstr "SD Kartı" msgid "SD card not found!" msgstr "SD kartı bulunamadı!" +msgid "Show Crosshair" +msgstr "Artı İmleci Göster" + msgid "Show Frame Rate" msgstr "FPS'yi Göster" -msgid "Snapshot" -msgstr "Enstantane" - -msgid "Snapshot (Auto)" -msgstr "Enstantane (Otomatik)" - msgid "SNES Controller" msgstr "SNES Oyun Kumandası" @@ -580,6 +583,9 @@ msgstr "Snes9x - Telif Hakkı (c) Snes9x Team 1996-2022" msgid "Sound Effects Volume" msgstr "Efekt Sesleri" +msgid "Sound Interpolation" +msgstr "Ses Interpolasyonu" + msgid "Spanish" msgstr "İspanyolca" @@ -598,8 +604,8 @@ msgstr "Durum (Otomatik)" msgid "State file not found" msgstr "Durum dosyası bulunamadı" -msgid "Stereo Inversion" -msgstr "Stereo İnversiyon" +msgid "SuperFX Overclocking" +msgstr "SuperFX Hız Aşırtma" msgid "Super Scope" msgstr "Nintendo Scope" @@ -616,6 +622,9 @@ msgstr "Turbo Modu" msgid "Turbo Mode Button" msgstr "Buton Turbo Modu" +msgid "TV Mode" +msgstr "TV Modu" + msgid "Unable to locate a load device!" msgstr "Yükleme aygıtı bulunamıyor!" @@ -625,9 +634,6 @@ msgstr "Kayıt aygıtı bulunamıyor!" msgid "Unable to open state!" msgstr "Durum açılamıyor!" -msgid "Unfiltered" -msgstr "Filtre Yok" - msgid "Unknown file type!" msgstr "Tanınmayan dosya türü!" diff --git a/source/lang/zh.lang b/source/lang/zh.lang index 3289ae3..2d72ab3 100644 --- a/source/lang/zh.lang +++ b/source/lang/zh.lang @@ -2,7 +2,10 @@ msgstr "&" msgid "16:9 Correction" -msgstr "16:9 校正" +msgstr "16:9校正" + +msgid "240p Output" +msgstr "240p输出" msgid "7z decompression failed: Archive contains too many files" msgstr "7z解压缩失败： 压缩包内有很多文件" @@ -73,6 +76,9 @@ msgstr "B (连发)" msgid "Back" msgstr "返回" +msgid "Bilinear Filtering" +msgstr "双线性过滤" + msgid "Button Mapping" msgstr "按键映射" @@ -115,21 +121,18 @@ msgstr "封面预览" msgid "Covers Folder" msgstr "封面目录" +msgid "CPU Overclocking" +msgstr "CPU超频" + msgid "Credits" msgstr "作者信息" -msgid "Crosshair" -msgstr "十字准线" - msgid "Cursor" msgstr "光标" msgid "Data DVD" msgstr "数据DVD" -msgid "Default" -msgstr "预设" - msgid "Directory name is too long!" msgstr "目录名过长！" @@ -148,6 +151,9 @@ msgstr "荷兰语" msgid "Empty or invalid ZIP file!" msgstr "空或不正确的ZIP文件" +msgid "Emulation Hacks" +msgstr "仿真器黑客" + msgid "English" msgstr "英语" @@ -184,9 +190,6 @@ msgstr "退出" msgid "Exit Action" msgstr "离开后执行" -msgid "Filtered" -msgstr "已过滤" - msgid "Filtering" msgstr "滤镜" @@ -208,12 +211,18 @@ msgstr "游戏设定 - 按键映射" msgid "Game Settings - Cheats" msgstr "游戏设定 - 金手指" +msgid "Game Settings - Emulation Hacks" +msgstr "游戏设定 - 仿真器黑客" + msgid "Game Settings - Video" msgstr "游戏设定 - 视频" msgid "GameCube Controller" msgstr "GameCube 控制器" +msgid "Gaussian (Default)" +msgstr "高斯（预设）" + msgid "German" msgstr "德语" @@ -223,8 +232,8 @@ msgstr "返回" msgid "Hide SRAM Saving" msgstr "隐藏SRAM保存" -msgid "Hi Resolution" -msgstr "高分辨率" +msgid "Hi-Res Mode" +msgstr "高分辨率模式" msgid "Horizontal" msgstr "水平方向" @@ -232,9 +241,6 @@ msgstr "水平方向" msgid "Information" msgstr "信息" -msgid "Interpolation" -msgstr "插值" - msgid "Invalid file size!" msgstr "无效的文件大小！" @@ -283,6 +289,9 @@ msgstr "左" msgid "Left Button" msgstr "左按键" +msgid "Linear" +msgstr "线性" + msgid "Load" msgstr "读取" @@ -307,6 +316,9 @@ msgstr "从Patch读取中..." msgid "Loading..." msgstr "读取中..." +msgid "Low" +msgstr "低" + msgid "Main Menu" msgstr "主菜单" @@ -316,9 +328,15 @@ msgstr "匹配GC控制器" msgid "Match Wii Controls" msgstr "匹配Wii控制器" +msgid "Max" +msgstr "最大" + msgid "Maximum filepath length reached!" msgstr "文件长度达到最大" +msgid "Medium" +msgstr "中等的" + msgid "Menu" msgstr "菜单" @@ -337,9 +355,6 @@ msgstr "新的" msgid "No" msgstr "否" -msgid "No data to save!" -msgstr "不存在保存的数据" - msgid "No disc inserted!" msgstr "没有插入光盘！" @@ -361,14 +376,17 @@ msgstr "Wii左手柄" msgid "Off" msgstr "关闭" +msgid "OFF" +msgstr "关闭" + msgid "OK" msgstr "确定" msgid "On" msgstr "开启" -msgid "Original" -msgstr "原始" +msgid "ON" +msgstr "开启" msgid "Out of memory!" msgstr "内存不足！" @@ -430,15 +448,9 @@ msgstr "退出游戏吗？ 未保存的进度将丢失" msgid "R TRIG" msgstr "R扳机" -msgid "RAM saving is not available for FDS games!" -msgstr "任天堂磁盘驱动器游戏， 不能以RAM保存！" - msgid "Reboot" msgstr "重新启动" -msgid "Rendering" -msgstr "描绘" - msgid "Reset" msgstr "重置" @@ -514,9 +526,6 @@ msgstr "保存中..." msgid "Saving..." msgstr "保存中..." -msgid "Scaling" -msgstr "缩放" - msgid "Screen Position" msgstr "画面位置" @@ -541,6 +550,9 @@ msgstr "SD卡" msgid "SD card not found!" msgstr "未找到SD卡" +msgid "Show Crosshair" +msgstr "显示十字准星" + msgid "Show Frame Rate" msgstr "显示帧率" @@ -580,6 +592,9 @@ msgstr "Snes9x - 版权(c) Snes9x开发小组1996-2022" msgid "Sound Effects Volume" msgstr "效果音的音量" +msgid "Sound Interpolation" +msgstr "声音插值" + msgid "Spanish" msgstr "西班牙语" @@ -598,10 +613,7 @@ msgstr "状态" msgid "State file not found" msgstr "未找到状态文件" -msgid "Stereo Inversion" -msgstr "立体声反转" - -msgid "SuperFX Overclock" +msgid "SuperFX Overclocking" msgstr "SuperFX超频" msgid "Super Scope" @@ -622,6 +634,9 @@ msgstr "涡轮模式" msgid "Turbo Mode Button" msgstr "涡轮模式按钮" +msgid "TV Mode" +msgstr "电视模式" + msgid "Unable to locate a load device!" msgstr "无法定位读取的设备！" @@ -631,9 +646,6 @@ msgstr "无法定位保存的设备！" msgid "Unable to open state!" msgstr "无法打开状态！" -msgid "Unfiltered" -msgstr "没有过滤" - msgid "Unknown file type!" msgstr "无法识别的文件类型！" diff --git a/source/menu.cpp b/source/menu.cpp index c4cbe8f..856a0b0 100644 --- a/source/menu.cpp +++ b/source/menu.cpp @@ -2,6 +2,7 @@ * Snes9x Nintendo Wii/GameCube Port * * Tantric 2008-2022 + * Tanooki 2019-2022 * * menu.cpp * @@ -76,7 +77,6 @@ static GuiImage * bgTopImg = NULL; static GuiImage * bgBottomImg = NULL; static GuiSound * bgMusic = NULL; static GuiSound * enterSound = NULL; -static GuiSound * exitSound = NULL; static GuiWindow * mainWindow = NULL; static GuiText * settingText = NULL; static GuiText * settingText2 = NULL; @@ -717,6 +717,7 @@ SettingWindow(const char * title, GuiWindow * w) GuiWindow promptWindow(448,288); promptWindow.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); + promptWindow.SetPosition(0, -10); GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM); GuiSound btnSoundClick(button_click_pcm, button_click_pcm_size, SOUND_PCM); GuiImageData btnOutline(button_png); @@ -1040,13 +1041,13 @@ static int MenuGameSelection() GuiImage bgPreview(&bgPreviewImg); GuiButton bgPreviewBtn(bgPreview.GetWidth(), bgPreview.GetHeight()); bgPreviewBtn.SetImage(&bgPreview); - bgPreviewBtn.SetPosition(365, 98); + bgPreviewBtn.SetPosition(355, 98); bgPreviewBtn.SetTrigger(&trigPlusMinus); int previousPreviewImg = GCSettings.PreviewImage; GuiImage preview; preview.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); - preview.SetPosition(174, -8); + preview.SetPosition(168, -8); u8* imgBuffer = MEM_ALLOC(640 * 480 * 4); int previousBrowserIndex = -1; char imagePath[MAXJOLIET + 1]; @@ -1204,6 +1205,7 @@ static void ControllerWindow() { GuiWindow * w = new GuiWindow(300,250); w->SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); + w->SetPosition(0, -10); GuiTrigger trigLeft; trigLeft.SetButtonOnlyInFocusTrigger(-1, WPAD_BUTTON_LEFT | WPAD_CLASSIC_BUTTON_LEFT, PAD_BUTTON_LEFT, WIIDRC_BUTTON_LEFT); @@ -1351,7 +1353,8 @@ static void PlayerMappingWindow(int chan) static int MenuGame() { int menu = MENU_NONE; - + char filepath[1024]; + GuiText titleTxt((char *)Memory.ROMFilename, 22, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,40); @@ -1369,6 +1372,7 @@ static int MenuGame() GuiImageData iconSave(icon_game_save_png); GuiImageData iconDelete(icon_game_delete_png); GuiImageData iconReset(icon_game_reset_png); + GuiImageData iconScreenshot(icon_game_screenshot_png); GuiImageData battery(battery_png); GuiImageData batteryRed(battery_red_png); @@ -1434,7 +1438,7 @@ static int MenuGame() GuiImage resetBtnIcon(&iconReset); GuiButton resetBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight()); resetBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); - resetBtn.SetPosition(125, 250); + resetBtn.SetPosition(200, 250); resetBtn.SetLabel(&resetBtnTxt); resetBtn.SetImage(&resetBtnImg); resetBtn.SetImageOver(&resetBtnImgOver); @@ -1445,6 +1449,23 @@ static int MenuGame() resetBtn.SetTrigger(trig2); resetBtn.SetEffectGrow(); + GuiText screenshotBtnTxt("Screenshot", 22, (GXColor){0, 0, 0, 255}); + GuiImage screenshotBtnImg(&btnLargeOutline); + GuiImage screenshotBtnImgOver(&btnLargeOutlineOver); + GuiImage screenshotBtnIcon(&iconScreenshot); + GuiButton screenshotBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight()); + screenshotBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); + screenshotBtn.SetPosition(0, 250); + screenshotBtn.SetLabel(&screenshotBtnTxt); + screenshotBtn.SetImage(&screenshotBtnImg); + screenshotBtn.SetImageOver(&screenshotBtnImgOver); + screenshotBtn.SetIcon(&screenshotBtnIcon); + screenshotBtn.SetSoundOver(&btnSoundOver); + screenshotBtn.SetSoundClick(&btnSoundClick); + screenshotBtn.SetTrigger(trigA); + screenshotBtn.SetTrigger(trig2); + screenshotBtn.SetEffectGrow(); + GuiText gameSettingsBtnTxt("Game Settings", 22, (GXColor){0, 0, 0, 255}); gameSettingsBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-20); GuiImage gameSettingsBtnImg(&btnLargeOutline); @@ -1452,7 +1473,7 @@ static int MenuGame() GuiImage gameSettingsBtnIcon(&iconGameSettings); GuiButton gameSettingsBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight()); gameSettingsBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); - gameSettingsBtn.SetPosition(-125, 250); + gameSettingsBtn.SetPosition(-200, 250); gameSettingsBtn.SetLabel(&gameSettingsBtnTxt); gameSettingsBtn.SetImage(&gameSettingsBtnImg); gameSettingsBtn.SetImageOver(&gameSettingsBtnImgOver); @@ -1548,6 +1569,7 @@ static int MenuGame() w.Append(&loadBtn); w.Append(&deleteBtn); w.Append(&resetBtn); + w.Append(&screenshotBtn); w.Append(&gameSettingsBtn); #ifdef HW_RVL @@ -1653,6 +1675,14 @@ static int MenuGame() menu = MENU_EXIT; } } + else if(screenshotBtn.GetState() == STATE_CLICKED) + { + if (WindowPrompt("Preview Screenshot", "Save a new Preview Screenshot? Current Screenshot image will be overwritten.", "OK", "Cancel")) + { + snprintf(filepath, 1024, "%s%s/%s", pathPrefix[GCSettings.SaveMethod], GCSettings.ScreenshotsFolder, Memory.ROMFilename); + SavePreviewImg(filepath, NOTSILENT); + } + } else if(gameSettingsBtn.GetState() == STATE_CLICKED) { menu = MENU_GAMESETTINGS; @@ -1689,7 +1719,7 @@ static int MenuGame() ExitApp(); } else { - gameScreenImg = new GuiImage(screenwidth, screenheight, (GXColor){205, 205, 205, 255}); + gameScreenImg = new GuiImage(screenwidth, screenheight, (GXColor){205, 201, 205, 255}); gameScreenImg->ColorStripe(10); mainWindow->Insert(gameScreenImg, 0); ResumeGui(); @@ -1704,7 +1734,6 @@ static int MenuGame() { menu = MENU_EXIT; - exitSound->Play(); bgTopImg->SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_OUT, 15); closeBtn.SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_OUT, 15); titleTxt.SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_OUT, 15); @@ -2032,7 +2061,6 @@ static int MenuGameSaves(int action) { menu = MENU_EXIT; - exitSound->Play(); bgTopImg->SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_OUT, 15); closeBtn.SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_OUT, 15); titleTxt.SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_OUT, 15); @@ -2065,7 +2093,6 @@ static int MenuGameSaves(int action) static int MenuGameSettings() { int menu = MENU_NONE; - char filepath[1024]; GuiText titleTxt("Game Settings", 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); @@ -2082,7 +2109,7 @@ static int MenuGameSettings() GuiImageData iconAudio(icon_settings_audio_png); GuiImageData iconController(icon_game_controllers_png); GuiImageData iconCheats(icon_game_cheats_png); - GuiImageData iconScreenshot(icon_settings_screenshot_png); + GuiImageData iconHacks(icon_settings_hacks_png); GuiImageData btnCloseOutline(button_small_png); GuiImageData btnCloseOutlineOver(button_small_over_png); @@ -2160,22 +2187,23 @@ static int MenuGameSettings() controllerBtn.SetTrigger(trig2); controllerBtn.SetEffectGrow(); - GuiText screenshotBtnTxt("Screenshot", 22, (GXColor){0, 0, 0, 255}); - GuiImage screenshotBtnImg(&btnLargeOutline); - GuiImage screenshotBtnImgOver(&btnLargeOutlineOver); - GuiImage screenshotBtnIcon(&iconScreenshot); - GuiButton screenshotBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight()); - screenshotBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); - screenshotBtn.SetPosition(0, 250); - screenshotBtn.SetLabel(&screenshotBtnTxt); - screenshotBtn.SetImage(&screenshotBtnImg); - screenshotBtn.SetImageOver(&screenshotBtnImgOver); - screenshotBtn.SetIcon(&screenshotBtnIcon); - screenshotBtn.SetSoundOver(&btnSoundOver); - screenshotBtn.SetSoundClick(&btnSoundClick); - screenshotBtn.SetTrigger(trigA); - screenshotBtn.SetTrigger(trig2); - screenshotBtn.SetEffectGrow(); + GuiText hacksBtnTxt("Emulation Hacks", 22, (GXColor){0, 0, 0, 255}); + hacksBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-20); + GuiImage hacksBtnImg(&btnLargeOutline); + GuiImage hacksBtnImgOver(&btnLargeOutlineOver); + GuiImage hacksBtnIcon(&iconHacks); + GuiButton hacksBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight()); + hacksBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); + hacksBtn.SetPosition(0, 250); + hacksBtn.SetLabel(&hacksBtnTxt); + hacksBtn.SetImage(&hacksBtnImg); + hacksBtn.SetImageOver(&hacksBtnImgOver); + hacksBtn.SetIcon(&hacksBtnIcon); + hacksBtn.SetSoundOver(&btnSoundOver); + hacksBtn.SetSoundClick(&btnSoundClick); + hacksBtn.SetTrigger(trigA); + hacksBtn.SetTrigger(trig2); + hacksBtn.SetEffectGrow(); GuiText cheatsBtnTxt("Cheats", 22, (GXColor){0, 0, 0, 255}); GuiImage cheatsBtnImg(&btnLargeOutline); @@ -2232,7 +2260,7 @@ static int MenuGameSettings() w.Append(&videoBtn); w.Append(&audioBtn); w.Append(&controllerBtn); - w.Append(&screenshotBtn); + w.Append(&hacksBtn); w.Append(&cheatsBtn); w.Append(&closeBtn); w.Append(&backBtn); @@ -2264,27 +2292,19 @@ static int MenuGameSettings() else if(cheatsBtn.GetState() == STATE_CLICKED) { cheatsBtn.ResetState(); - - if(Cheat.g.size() > 0) { + if(Cheat.g.size() > 0) menu = MENU_GAMESETTINGS_CHEATS; - } - else { + else InfoPrompt("Cheats file not found!"); - } } - else if(screenshotBtn.GetState() == STATE_CLICKED) + else if(hacksBtn.GetState() == STATE_CLICKED) { - if (WindowPrompt("Preview Screenshot", "Save a new Preview Screenshot? Current Screenshot image will be overwritten.", "OK", "Cancel")) - { - snprintf(filepath, 1024, "%s%s/%s", pathPrefix[GCSettings.SaveMethod], GCSettings.ScreenshotsFolder, Memory.ROMFilename); - SavePreviewImg(filepath, NOTSILENT); - } + menu = MENU_GAMESETTINGS_HACKS; } else if(closeBtn.GetState() == STATE_CLICKED) { menu = MENU_EXIT; - exitSound->Play(); bgTopImg->SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_OUT, 15); closeBtn.SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_OUT, 15); titleTxt.SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_OUT, 15); @@ -3040,7 +3060,7 @@ static int MenuSettingsMappingsMap() GuiOptionBrowser optionBrowser(552, 248, &options); optionBrowser.SetPosition(0, 108); optionBrowser.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); - optionBrowser.SetCol2Position(215); + optionBrowser.SetCol2Position(225); HaltGui(); GuiWindow w(screenwidth, screenheight); @@ -3168,7 +3188,7 @@ static void ScreenZoomWindow() arrowLeftBtn.SetImage(&arrowLeftImg); arrowLeftBtn.SetImageOver(&arrowLeftOverImg); arrowLeftBtn.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); - arrowLeftBtn.SetPosition(50, 0); + arrowLeftBtn.SetPosition(50, -10); arrowLeftBtn.SetTrigger(trigA); arrowLeftBtn.SetTrigger(trig2); arrowLeftBtn.SetTrigger(&trigLeft); @@ -3183,7 +3203,7 @@ static void ScreenZoomWindow() arrowRightBtn.SetImage(&arrowRightImg); arrowRightBtn.SetImageOver(&arrowRightOverImg); arrowRightBtn.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); - arrowRightBtn.SetPosition(164, 0); + arrowRightBtn.SetPosition(164, -10); arrowRightBtn.SetTrigger(trigA); arrowRightBtn.SetTrigger(trig2); arrowRightBtn.SetTrigger(&trigRight); @@ -3198,7 +3218,7 @@ static void ScreenZoomWindow() arrowUpBtn.SetImage(&arrowUpImg); arrowUpBtn.SetImageOver(&arrowUpOverImg); arrowUpBtn.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); - arrowUpBtn.SetPosition(-76, -27); + arrowUpBtn.SetPosition(-76, -37); arrowUpBtn.SetTrigger(trigA); arrowUpBtn.SetTrigger(trig2); arrowUpBtn.SetTrigger(&trigUp); @@ -3213,7 +3233,7 @@ static void ScreenZoomWindow() arrowDownBtn.SetImage(&arrowDownImg); arrowDownBtn.SetImageOver(&arrowDownOverImg); arrowDownBtn.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); - arrowDownBtn.SetPosition(-76, 27); + arrowDownBtn.SetPosition(-76, 17); arrowDownBtn.SetTrigger(trigA); arrowDownBtn.SetTrigger(trig2); arrowDownBtn.SetTrigger(&trigDown); @@ -3223,17 +3243,17 @@ static void ScreenZoomWindow() GuiImageData screenPosition(screen_position_png); GuiImage screenPositionImg(&screenPosition); screenPositionImg.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); - screenPositionImg.SetPosition(0, 0); + screenPositionImg.SetPosition(0, -10); settingText = new GuiText(NULL, 20, (GXColor){0, 0, 0, 255}); settingText2 = new GuiText(NULL, 20, (GXColor){0, 0, 0, 255}); char zoom[10]; sprintf(zoom, "%.2f%%", GCSettings.zoomHor*100); settingText->SetText(zoom); - settingText->SetPosition(108, 0); + settingText->SetPosition(108, -10); sprintf(zoom, "%.2f%%", GCSettings.zoomVert*100); settingText2->SetText(zoom); - settingText2->SetPosition(-76, 0); + settingText2->SetPosition(-76, -10); float currentZoomHor = GCSettings.zoomHor; float currentZoomVert = GCSettings.zoomVert; @@ -3287,7 +3307,7 @@ static void ScreenPositionWindow() { GuiWindow * w = new GuiWindow(150,150); w->SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); - w->SetPosition(0, -10); + w->SetPosition(0, -20); GuiTrigger trigLeft; trigLeft.SetButtonOnlyInFocusTrigger(-1, WPAD_BUTTON_LEFT | WPAD_CLASSIC_BUTTON_LEFT, PAD_BUTTON_LEFT, WIIDRC_BUTTON_LEFT); @@ -3397,7 +3417,6 @@ static int MenuSettingsTurboMode() sprintf(options.name[i++], "Turbo Mode"); sprintf(options.name[i++], "Turbo Mode Button"); - options.length = i; for(i=0; i < options.length; i++) @@ -3433,7 +3452,7 @@ static int MenuSettingsTurboMode() GuiOptionBrowser optionBrowser(552, 248, &options); optionBrowser.SetPosition(0, 108); - optionBrowser.SetCol2Position(200); + optionBrowser.SetCol2Position(225); optionBrowser.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); HaltGui(); @@ -3527,21 +3546,20 @@ static int MenuSettingsVideo() bool firstRun = true; OptionList options; - sprintf(options.name[i++], "Rendering"); sprintf(options.name[i++], "Video Mode"); - sprintf(options.name[i++], "Scaling"); + sprintf(options.name[i++], "240p Output"); + sprintf(options.name[i++], "Bilinear Filtering"); + sprintf(options.name[i++], "16:9 Correction"); sprintf(options.name[i++], "Screen Zoom"); sprintf(options.name[i++], "Screen Position"); sprintf(options.name[i++], "Filtering"); - sprintf(options.name[i++], "Hi Resolution"); - sprintf(options.name[i++], "Sprite Limit"); - sprintf(options.name[i++], "Crosshair"); + sprintf(options.name[i++], "Hi-Res Mode"); + sprintf(options.name[i++], "Show Crosshair"); sprintf(options.name[i++], "Show Frame Rate"); - sprintf(options.name[i++], "SuperFX Overclock"); options.length = i; #ifdef HW_DOL - options.name[5][0] = 0; // disable filtering on GameCube + options.name[6][0] = 0; // disable filtering on GameCube #endif for(i=0; i < options.length; i++) @@ -3573,7 +3591,7 @@ static int MenuSettingsVideo() GuiOptionBrowser optionBrowser(552, 248, &options); optionBrowser.SetPosition(0, 108); - optionBrowser.SetCol2Position(200); + optionBrowser.SetCol2Position(225); optionBrowser.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); HaltGui(); @@ -3593,41 +3611,39 @@ static int MenuSettingsVideo() switch (ret) { case 0: - GCSettings.render++; - if (GCSettings.render > 2) - GCSettings.render = 0; - break; - - case 1: GCSettings.videomode++; if(GCSettings.videomode > 4) GCSettings.videomode = 0; break; + case 1: + GCSettings.render ^= 1; + break; + case 2: - GCSettings.widescreen ^= 1; + GCSettings.bilinear ^= 1; break; case 3: - ScreenZoomWindow(); + GCSettings.widescreen ^= 1; break; case 4: - ScreenPositionWindow(); + ScreenZoomWindow(); break; case 5: - GCSettings.FilterMethod++; - if (GCSettings.FilterMethod >= NUM_FILTERS) - GCSettings.FilterMethod = 0; + ScreenPositionWindow(); break; case 6: - GCSettings.HiResolution ^= 1; + GCSettings.FilterMethod++; + if (GCSettings.FilterMethod >= NUM_FILTERS) + GCSettings.FilterMethod = 0; break; case 7: - GCSettings.SpriteLimit ^= 1; + GCSettings.HiResMode ^= 1; break; case 8: @@ -3637,91 +3653,38 @@ static int MenuSettingsVideo() case 9: GCSettings.ShowFrameRate ^= 1; break; - - case 10: - #ifdef HW_RVL - GCSettings.sfxOverclock++; - if (GCSettings.sfxOverclock > 6) { - GCSettings.sfxOverclock = 0; - } - #else - GCSettings.sfxOverclock++; - if (GCSettings.sfxOverclock > 3) { - GCSettings.sfxOverclock = 0; - } - #endif - switch(GCSettings.sfxOverclock) - { - case 0: Settings.SuperFXSpeedPerLine = 5823405; break; - case 1: Settings.SuperFXSpeedPerLine = 0.417 * 20.5e6; break; - case 2: Settings.SuperFXSpeedPerLine = 0.417 * 40.5e6; break; - case 3: Settings.SuperFXSpeedPerLine = 0.417 * 60.5e6; break; - case 4: Settings.SuperFXSpeedPerLine = 0.417 * 80.5e6; break; - case 5: Settings.SuperFXSpeedPerLine = 0.417 * 100.5e6; break; - case 6: Settings.SuperFXSpeedPerLine = 0.417 * 120.5e6; break; - } - S9xResetSuperFX(); - S9xReset(); - break; } if(ret >= 0 || firstRun) { firstRun = false; - if (GCSettings.render == 0) - sprintf (options.value[0], "Original"); - else if (GCSettings.render == 1) - sprintf (options.value[0], "Unfiltered"); - else if (GCSettings.render == 2) - sprintf (options.value[0], "Filtered"); - switch(GCSettings.videomode) { case 0: - sprintf (options.value[1], "Automatic (Recommended)"); break; + sprintf (options.value[0], "Automatic (Recommended)"); break; case 1: - sprintf (options.value[1], "NTSC (480i)"); break; + sprintf (options.value[0], "NTSC (480i)"); break; case 2: - sprintf (options.value[1], "Progressive (480p)"); break; + sprintf (options.value[0], "Progressive (480p)"); break; case 3: - sprintf (options.value[1], "PAL (50Hz)"); break; + sprintf (options.value[0], "PAL (50Hz)"); break; case 4: - sprintf (options.value[1], "PAL (60Hz)"); break; + sprintf (options.value[0], "PAL (60Hz)"); break; } - if(GCSettings.widescreen) - sprintf (options.value[2], "16:9 Correction"); - else - sprintf (options.value[2], "Default"); - - sprintf (options.value[3], "%.2f%%, %.2f%%", GCSettings.zoomHor*100, GCSettings.zoomVert*100); - sprintf (options.value[4], "%d, %d", GCSettings.xshift, GCSettings.yshift); + sprintf (options.value[1], "%s", GCSettings.render == 1 ? "On" : "Off"); + sprintf (options.value[2], "%s", GCSettings.bilinear == 1 ? "On" : "Off"); + sprintf (options.value[3], "%s", GCSettings.widescreen == 1 ? "On" : "Off"); + sprintf (options.value[4], "%.2f%%, %.2f%%", GCSettings.zoomHor*100, GCSettings.zoomVert*100); + sprintf (options.value[5], "%d, %d", GCSettings.xshift, GCSettings.yshift); #ifdef HW_RVL - sprintf (options.value[5], "%s", GetFilterName((RenderFilter)GCSettings.FilterMethod)); + sprintf (options.value[6], "%s", GetFilterName((RenderFilter)GCSettings.FilterMethod)); #endif - sprintf (options.value[6], "%s", GCSettings.HiResolution == 1 ? "On" : "Off"); - sprintf (options.value[7], "%s", GCSettings.SpriteLimit == 1 ? "On" : "Off"); + sprintf (options.value[7], "%s", GCSettings.HiResMode == 1 ? "On" : "Off"); sprintf (options.value[8], "%s", GCSettings.crosshair == 1 ? "On" : "Off"); sprintf (options.value[9], "%s", GCSettings.ShowFrameRate == 1 ? "On" : "Off"); - switch(GCSettings.sfxOverclock) - { - case 0: - sprintf (options.value[10], "Default"); break; - case 1: - sprintf (options.value[10], "20 MHz"); break; - case 2: - sprintf (options.value[10], "40 MHz"); break; - case 3: - sprintf (options.value[10], "60 MHz"); break; - case 4: - sprintf (options.value[10], "80 MHz"); break; - case 5: - sprintf (options.value[10], "100 MHz"); break; - case 6: - sprintf (options.value[10], "120 MHz"); break; - } optionBrowser.TriggerUpdate(); } @@ -3748,8 +3711,8 @@ static int MenuSettingsAudio() bool firstRun = true; OptionList options; - sprintf(options.name[i++], "Stereo Inversion"); - sprintf(options.name[i++], "Interpolation"); + sprintf(options.name[i++], "Sound Interpolation"); + sprintf(options.name[i++], "Mute"); options.length = i; for(i=0; i < options.length; i++) @@ -3781,7 +3744,7 @@ static int MenuSettingsAudio() GuiOptionBrowser optionBrowser(552, 248, &options); optionBrowser.SetPosition(0, 108); - optionBrowser.SetCol2Position(200); + optionBrowser.SetCol2Position(225); optionBrowser.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); HaltGui(); @@ -3801,10 +3764,6 @@ static int MenuSettingsAudio() switch (ret) { case 0: - GCSettings.ReverseStereo ^= 1; - break; - - case 1: GCSettings.Interpolation++; if (GCSettings.Interpolation > 4) { GCSettings.Interpolation = 0; @@ -3818,28 +3777,208 @@ static int MenuSettingsAudio() case 4: Settings.InterpolationMethod = DSP_INTERPOLATION_NONE; break; } break; - S9xReset(); + + case 1: + GCSettings.MuteAudio ^= 1; + break; } if(ret >= 0 || firstRun) { firstRun = false; - sprintf (options.value[0], "%s", GCSettings.ReverseStereo == 1 ? "On" : "Off"); - switch(GCSettings.Interpolation) { case 0: - sprintf (options.value[1], "Gaussian (SNES Hardware)"); break; + sprintf (options.value[0], "Gaussian (Default)"); break; case 1: - sprintf (options.value[1], "Linear"); break; + sprintf (options.value[0], "Linear"); break; case 2: - sprintf (options.value[1], "Cubic"); break; + sprintf (options.value[0], "Cubic"); break; case 3: - sprintf (options.value[1], "Sinc"); break; + sprintf (options.value[0], "Sinc"); break; case 4: + sprintf (options.value[0], "None"); break; + } + + sprintf (options.value[1], "%s", GCSettings.MuteAudio == 1 ? "On" : "Off"); + + optionBrowser.TriggerUpdate(); + } + + if(backBtn.GetState() == STATE_CLICKED) + { + menu = MENU_GAMESETTINGS; + } + } + HaltGui(); + mainWindow->Remove(&optionBrowser); + mainWindow->Remove(&w); + mainWindow->Remove(&titleTxt); + return menu; +} + +/**************************************************************************** + * MenuSettingsHacks + ***************************************************************************/ +static int MenuSettingsHacks() +{ + int menu = MENU_NONE; + int ret; + int i = 0; + bool firstRun = true; + OptionList options; + + sprintf(options.name[i++], "SuperFX Overclocking"); + sprintf(options.name[i++], "CPU Overclocking"); + sprintf(options.name[i++], "Sprite Limit"); + options.length = i; + + for(i=0; i < options.length; i++) + options.value[i][0] = 0; + + GuiText titleTxt("Game Settings - Emulation Hacks", 26, (GXColor){255, 255, 255, 255}); + titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); + titleTxt.SetPosition(50,50); + + GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM); + GuiSound btnSoundClick(button_click_pcm, button_click_pcm_size, SOUND_PCM); + GuiImageData btnOutline(button_png); + GuiImageData btnOutlineOver(button_over_png); + + GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255}); + GuiImage backBtnImg(&btnOutline); + GuiImage backBtnImgOver(&btnOutlineOver); + GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); + backBtn.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); + backBtn.SetPosition(50, -35); + backBtn.SetLabel(&backBtnTxt); + backBtn.SetImage(&backBtnImg); + backBtn.SetImageOver(&backBtnImgOver); + backBtn.SetSoundOver(&btnSoundOver); + backBtn.SetSoundClick(&btnSoundClick); + backBtn.SetTrigger(trigA); + backBtn.SetTrigger(trig2); + backBtn.SetEffectGrow(); + + GuiOptionBrowser optionBrowser(552, 248, &options); + optionBrowser.SetPosition(0, 108); + optionBrowser.SetCol2Position(225); + optionBrowser.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); + + HaltGui(); + GuiWindow w(screenwidth, screenheight); + w.Append(&backBtn); + mainWindow->Append(&optionBrowser); + mainWindow->Append(&w); + mainWindow->Append(&titleTxt); + ResumeGui(); + + while(menu == MENU_NONE) + { + usleep(THREAD_SLEEP); + + ret = optionBrowser.GetClickedOption(); + + switch (ret) + { + case 0: + #ifdef HW_RVL + GCSettings.sfxOverclock++; + if (GCSettings.sfxOverclock > 6) { + GCSettings.sfxOverclock = 0; + } + #else + GCSettings.sfxOverclock++; + if (GCSettings.sfxOverclock > 3) { + GCSettings.sfxOverclock = 0; + } + #endif + switch(GCSettings.sfxOverclock) + { + case 0: Settings.SuperFXSpeedPerLine = 5823405; break; + case 1: Settings.SuperFXSpeedPerLine = 0.417 * 20.5e6; break; + case 2: Settings.SuperFXSpeedPerLine = 0.417 * 40.5e6; break; + case 3: Settings.SuperFXSpeedPerLine = 0.417 * 60.5e6; break; + case 4: Settings.SuperFXSpeedPerLine = 0.417 * 80.5e6; break; + case 5: Settings.SuperFXSpeedPerLine = 0.417 * 100.5e6; break; + case 6: Settings.SuperFXSpeedPerLine = 0.417 * 120.5e6; break; + } + S9xResetSuperFX(); + S9xReset(); + break; + + case 1: + GCSettings.cpuOverclock++; + if (GCSettings.cpuOverclock > 3) { + GCSettings.cpuOverclock = 0; + } + switch(GCSettings.cpuOverclock) + { + case 0: + Settings.OneClockCycle = 6; + Settings.OneSlowClockCycle = 8; + Settings.TwoClockCycles = 12; + break; + case 1: + Settings.OneClockCycle = 6; + Settings.OneSlowClockCycle = 6; + Settings.TwoClockCycles = 12; + break; + case 2: + Settings.OneClockCycle = 4; + Settings.OneSlowClockCycle = 5; + Settings.TwoClockCycles = 6; + break; + case 3: + Settings.OneClockCycle = 3; + Settings.OneSlowClockCycle = 3; + Settings.TwoClockCycles = 3; + break; + } + break; + + case 2: + GCSettings.SpriteLimit ^= 1; + break; + } + + if(ret >= 0 || firstRun) + { + firstRun = false; + + switch(GCSettings.sfxOverclock) + { + case 0: + sprintf (options.value[0], "None"); break; + case 1: + sprintf (options.value[0], "20 MHz"); break; + case 2: + sprintf (options.value[0], "40 MHz"); break; + case 3: + sprintf (options.value[0], "60 MHz"); break; + case 4: + sprintf (options.value[0], "80 MHz"); break; + case 5: + sprintf (options.value[0], "100 MHz"); break; + case 6: + sprintf (options.value[0], "120 MHz"); break; + } + + switch(GCSettings.cpuOverclock) + { + case 0: sprintf (options.value[1], "None"); break; + case 1: + sprintf (options.value[1], "Low"); break; + case 2: + sprintf (options.value[1], "Medium"); break; + case 3: + sprintf (options.value[1], "Max"); break; } + + sprintf (options.value[2], "%s", GCSettings.SpriteLimit == 1 ? "On" : "Off"); + optionBrowser.TriggerUpdate(); } @@ -3861,6 +4000,10 @@ static int MenuSettingsAudio() static int MenuSettings() { int menu = MENU_NONE; + char satellaviewTxt[10]; + + if(GCSettings.Satellaview) sprintf(satellaviewTxt, "ON"); + else sprintf(satellaviewTxt, "OFF"); GuiText titleTxt("Settings", 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); @@ -3874,7 +4017,8 @@ static int MenuSettings() GuiImageData btnLargeOutlineOver(button_large_over_png); GuiImageData iconFile(icon_settings_file_png); GuiImageData iconMenu(icon_settings_menu_png); - GuiImageData iconCredits(icon_credits_png); + GuiImageData iconSatellaview(icon_game_satellaview_png); + GuiImageData iconCredits(icon_settings_credits_png); GuiText savingBtnTxt1("Saving", 22, (GXColor){0, 0, 0, 255}); GuiText savingBtnTxt2("&", 18, (GXColor){0, 0, 0, 255}); @@ -3917,6 +4061,27 @@ static int MenuSettings() menuBtn.SetTrigger(trig2); menuBtn.SetEffectGrow(); + GuiText satellaviewBtnTxt("Satellaview", 22, (GXColor){0, 0, 0, 255}); + GuiText satellaviewBtnTxt2(satellaviewTxt, 18, (GXColor){0, 0, 0, 255}); + satellaviewBtnTxt.SetPosition(0, -16); + satellaviewBtnTxt2.SetPosition(0, +8); + GuiImage satellaviewBtnImg(&btnLargeOutline); + GuiImage satellaviewBtnImgOver(&btnLargeOutlineOver); + GuiImage satellaviewBtnIcon(&iconSatellaview); + GuiButton satellaviewBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight()); + satellaviewBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); + satellaviewBtn.SetPosition(-125, 250); + satellaviewBtn.SetLabel(&satellaviewBtnTxt, 0); + satellaviewBtn.SetLabel(&satellaviewBtnTxt2, 1); + satellaviewBtn.SetImage(&satellaviewBtnImg); + satellaviewBtn.SetImageOver(&satellaviewBtnImgOver); + satellaviewBtn.SetIcon(&satellaviewBtnIcon); + satellaviewBtn.SetSoundOver(&btnSoundOver); + satellaviewBtn.SetSoundClick(&btnSoundClick); + satellaviewBtn.SetTrigger(trigA); + satellaviewBtn.SetTrigger(trig2); + satellaviewBtn.SetEffectGrow(); + GuiText creditsBtnTxt("Credits", 22, (GXColor){0, 0, 0, 255}); creditsBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-20); GuiImage creditsBtnImg(&btnLargeOutline); @@ -3924,7 +4089,7 @@ static int MenuSettings() GuiImage creditsBtnIcon(&iconCredits); GuiButton creditsBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight()); creditsBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); - creditsBtn.SetPosition(0, 250); + creditsBtn.SetPosition(125, 250); creditsBtn.SetLabel(&creditsBtnTxt); creditsBtn.SetImage(&creditsBtnImg); creditsBtn.SetImageOver(&creditsBtnImgOver); @@ -3971,6 +4136,7 @@ static int MenuSettings() w.Append(&titleTxt); w.Append(&savingBtn); w.Append(&menuBtn); + w.Append(&satellaviewBtn); w.Append(&creditsBtn); w.Append(&backBtn); w.Append(&resetBtn); @@ -3991,6 +4157,15 @@ static int MenuSettings() { menu = MENU_SETTINGS_MENU; } + else if(satellaviewBtn.GetState() == STATE_CLICKED) + { + satellaviewBtn.ResetState(); + + GCSettings.Satellaview ^= 1; + if (GCSettings.Satellaview) sprintf(satellaviewTxt, "ON"); + else sprintf(satellaviewTxt, "OFF"); + satellaviewBtnTxt2.SetText(satellaviewTxt); + } else if(creditsBtn.GetState() == STATE_CLICKED) { showCredits = true; @@ -4072,7 +4247,7 @@ static int MenuSettingsFile() GuiOptionBrowser optionBrowser(552, 248, &options); optionBrowser.SetPosition(0, 108); optionBrowser.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); - optionBrowser.SetCol2Position(215); + optionBrowser.SetCol2Position(225); HaltGui(); GuiWindow w(screenwidth, screenheight); @@ -4463,7 +4638,7 @@ MainMenu (int menu) } else { - gameScreenImg = new GuiImage(screenwidth, screenheight, (GXColor){205, 205, 205, 255}); + gameScreenImg = new GuiImage(screenwidth, screenheight, (GXColor){205, 201, 205, 255}); gameScreenImg->ColorStripe(10); } @@ -4526,8 +4701,6 @@ MainMenu (int menu) bgMusic->SetLoop(true); enterSound = new GuiSound(enter_ogg, enter_ogg_size, SOUND_OGG); enterSound->SetVolume(GCSettings.SFXVolume); - exitSound = new GuiSound(exit_ogg, exit_ogg_size, SOUND_OGG); - exitSound->SetVolume(GCSettings.SFXVolume); } if(currentMenu == MENU_GAMESELECTION) @@ -4579,6 +4752,9 @@ MainMenu (int menu) case MENU_GAMESETTINGS_CHEATS: currentMenu = MenuGameCheats(); break; + case MENU_GAMESETTINGS_HACKS: + currentMenu = MenuSettingsHacks(); + break; case MENU_SETTINGS: currentMenu = MenuSettings(); break; diff --git a/source/menu.h b/source/menu.h index d770e88..61d0b50 100644 --- a/source/menu.h +++ b/source/menu.h @@ -2,6 +2,7 @@ * Snes9x Nintendo Wii/GameCube Port * * Tantric 2008-2022 + * Tanooki 2019-2022 * * menu.h * @@ -45,7 +46,8 @@ enum MENU_GAMESETTINGS_MAPPINGS_MAP, MENU_GAMESETTINGS_VIDEO, MENU_GAMESETTINGS_AUDIO, - MENU_GAMESETTINGS_CHEATS + MENU_GAMESETTINGS_CHEATS, + MENU_GAMESETTINGS_HACKS }; #endif diff --git a/source/preferences.cpp b/source/preferences.cpp index 775b846..0ddefc7 100644 --- a/source/preferences.cpp +++ b/source/preferences.cpp @@ -2,6 +2,7 @@ * Snes9x Nintendo Wii/GameCube Port * * Tantric 2008-2022 + * Tanooki 2019-2022 * * preferences.cpp * @@ -19,6 +20,7 @@ #include "snes9xtx.h" #include "menu.h" #include "fileop.h" +#include "video.h" #include "filebrowser.h" #include "input.h" #include "button_mapping.h" @@ -129,6 +131,7 @@ preparePrefsData () createXMLSetting("LastFileLoaded", "Last File Loaded", GCSettings.LastFileLoaded); createXMLSetting("SaveFolder", "Save Folder", GCSettings.SaveFolder); createXMLSetting("CheatFolder", "Cheats Folder", GCSettings.CheatFolder); + createXMLSetting("Satellaview", "Satellaview", toStr(GCSettings.Satellaview)); createXMLSetting("ScreenshotsFolder", "Screenshots Folder", GCSettings.ScreenshotsFolder); createXMLSetting("CoverFolder", "Covers Folder", GCSettings.CoverFolder); createXMLSetting("ArtworkFolder", "Artwork Folder", GCSettings.ArtworkFolder); @@ -138,21 +141,26 @@ preparePrefsData () createXMLSetting("videomode", "Video Mode", toStr(GCSettings.videomode)); createXMLSetting("zoomHor", "Horizontal Zoom Level", FtoStr(GCSettings.zoomHor)); createXMLSetting("zoomVert", "Vertical Zoom Level", FtoStr(GCSettings.zoomVert)); - createXMLSetting("render", "Video Filtering", toStr(GCSettings.render)); + createXMLSetting("render", "Video Rendering", toStr(GCSettings.render)); + createXMLSetting("bilinear", "Bilinear Filtering", toStr(GCSettings.bilinear)); createXMLSetting("widescreen", "Aspect Ratio Correction", toStr(GCSettings.widescreen)); createXMLSetting("FilterMethod", "Filter Method", toStr(GCSettings.FilterMethod)); - createXMLSetting("HiResolution", "Hi Resolution", toStr(GCSettings.HiResolution)); - createXMLSetting("SpriteLimit", "Sprite Limit", toStr(GCSettings.SpriteLimit)); + createXMLSetting("HiResMode", "Hi-Res Mode", toStr(GCSettings.HiResMode)); + createXMLSetting("crosshair", "Show Crosshair", toStr(GCSettings.crosshair)); createXMLSetting("ShowFrameRate", "Show Frame Rate", toStr(GCSettings.ShowFrameRate)); - createXMLSetting("crosshair", "Crosshair", toStr(GCSettings.crosshair)); createXMLSetting("xshift", "Horizontal Video Shift", toStr(GCSettings.xshift)); createXMLSetting("yshift", "Vertical Video Shift", toStr(GCSettings.yshift)); - createXMLSetting("sfxOverclock", "SuperFX Overclock", toStr(GCSettings.sfxOverclock)); createXMLSection("Audio", "Audio Settings"); - createXMLSetting("ReverseStereo", "Stereo Inversion", toStr(GCSettings.ReverseStereo)); - createXMLSetting("Interpolation", "Interpolation", toStr(GCSettings.Interpolation)); + createXMLSetting("Interpolation", "Sound Interpolation", toStr(GCSettings.Interpolation)); + createXMLSetting("MuteAudio", "Mute", toStr(GCSettings.MuteAudio)); + + createXMLSection("Emulation Hacks", "Emulation Hacks Settings"); + + createXMLSetting("sfxOverclock", "SuperFX Overclocking", toStr(GCSettings.sfxOverclock)); + createXMLSetting("cpuOverclock", "CPU Overclocking", toStr(GCSettings.cpuOverclock)); + createXMLSetting("SpriteLimit", "Sprite Limit", toStr(GCSettings.SpriteLimit)); createXMLSection("Menu", "Menu Settings"); @@ -312,6 +320,7 @@ decodePrefsData () loadXMLSetting(GCSettings.LastFileLoaded, "LastFileLoaded", sizeof(GCSettings.LastFileLoaded)); loadXMLSetting(GCSettings.SaveFolder, "SaveFolder", sizeof(GCSettings.SaveFolder)); loadXMLSetting(GCSettings.CheatFolder, "CheatFolder", sizeof(GCSettings.CheatFolder)); + loadXMLSetting(&GCSettings.Satellaview, "Satellaview"); loadXMLSetting(GCSettings.ScreenshotsFolder, "ScreenshotsFolder", sizeof(GCSettings.ScreenshotsFolder)); loadXMLSetting(GCSettings.CoverFolder, "CoverFolder", sizeof(GCSettings.CoverFolder)); loadXMLSetting(GCSettings.ArtworkFolder, "ArtworkFolder", sizeof(GCSettings.ArtworkFolder)); @@ -322,23 +331,25 @@ decodePrefsData () loadXMLSetting(&GCSettings.zoomHor, "zoomHor"); loadXMLSetting(&GCSettings.zoomVert, "zoomVert"); loadXMLSetting(&GCSettings.render, "render"); + loadXMLSetting(&GCSettings.bilinear, "bilinear"); loadXMLSetting(&GCSettings.widescreen, "widescreen"); loadXMLSetting(&GCSettings.FilterMethod, "FilterMethod"); - loadXMLSetting(&GCSettings.HiResolution, "HiResolution"); - loadXMLSetting(&GCSettings.SpriteLimit, "SpriteLimit"); - loadXMLSetting(&GCSettings.ShowFrameRate, "ShowFrameRate"); + loadXMLSetting(&GCSettings.HiResMode, "HiResMode"); loadXMLSetting(&GCSettings.crosshair, "crosshair"); + loadXMLSetting(&GCSettings.ShowFrameRate, "ShowFrameRate"); loadXMLSetting(&GCSettings.xshift, "xshift"); loadXMLSetting(&GCSettings.yshift, "yshift"); // Audio Settings - loadXMLSetting(&GCSettings.ReverseStereo, "ReverseStereo"); loadXMLSetting(&GCSettings.Interpolation, "Interpolation"); + loadXMLSetting(&GCSettings.MuteAudio, "MuteAudio"); - // Emulation Settings + // Emulation Hacks Settings loadXMLSetting(&GCSettings.sfxOverclock, "sfxOverclock"); + loadXMLSetting(&GCSettings.cpuOverclock, "cpuOverclock"); + loadXMLSetting(&GCSettings.SpriteLimit, "SpriteLimit"); // Menu Settings @@ -403,10 +414,10 @@ void FixInvalidSettings() GCSettings.language = LANG_ENGLISH; if(GCSettings.Controller > CTRL_PAD4 || GCSettings.Controller < CTRL_MOUSE) GCSettings.Controller = CTRL_PAD2; - if(!(GCSettings.render >= 0 && GCSettings.render < 3)) - GCSettings.render = 2; if(!(GCSettings.videomode >= 0 && GCSettings.videomode < 5)) GCSettings.videomode = 0; + if(!(GCSettings.render >= 0 && GCSettings.render < 2)) + GCSettings.render = 0; } /**************************************************************************** @@ -419,26 +430,16 @@ DefaultSettings () { memset (&GCSettings, 0, sizeof (GCSettings)); - ResetControls(); // controller button mappings - - GCSettings.LoadMethod = DEVICE_AUTO; // Auto, SD, DVD, USB - GCSettings.SaveMethod = DEVICE_AUTO; // Auto, SD, USB - sprintf (GCSettings.LoadFolder, "%s/roms", APPFOLDER); // Path to game files - sprintf (GCSettings.SaveFolder, "%s/saves", APPFOLDER); // Path to save files - sprintf (GCSettings.CheatFolder, "%s/cheats", APPFOLDER); // Path to cheat files - sprintf (GCSettings.ScreenshotsFolder, "%s/screenshots", APPFOLDER); // Path to screenshot files - sprintf (GCSettings.CoverFolder, "%s/covers", APPFOLDER); // Path to cover files - sprintf (GCSettings.ArtworkFolder, "%s/artwork", APPFOLDER); // Path to artwork files - GCSettings.AutoLoad = 1; // Auto Load SRAM - GCSettings.AutoSave = 1; // Auto Save SRAM + ResetControls(); // Controller button mappings GCSettings.Controller = CTRL_PAD2; // SNES Pad, Four Score, SNES Mouse, Super Scope, Justifier GCSettings.TurboMode = 1; // Enabled by default - GCSettings.TurboModeButton = 0; // Default is Right Analog Stick (0) + GCSettings.TurboModeButton = 0; // Default is right analog stick (0) - GCSettings.videomode = 0; // automatic video mode detection - GCSettings.render = 1; // Unfiltered - GCSettings.FilterMethod = FILTER_NONE; // no filtering + GCSettings.videomode = 0; // Automatic video mode detection + GCSettings.render = 0; // Default rendering mode + GCSettings.bilinear = 0; // Disabled by default + GCSettings.FilterMethod = FILTER_NONE; // No filtering by default GCSettings.crosshair = 1; // Enabled by default GCSettings.widescreen = 0; @@ -448,10 +449,10 @@ DefaultSettings () GCSettings.widescreen = 1; #endif - GCSettings.zoomHor = 1.0; // horizontal zoom level - GCSettings.zoomVert = 1.0; // vertical zoom level - GCSettings.xshift = 0; // horizontal video shift - GCSettings.yshift = 0; // vertical video shift + GCSettings.zoomHor = 1.0; // Horizontal zoom level + GCSettings.zoomVert = 1.0; // Vertical zoom level + GCSettings.xshift = 0; // Horizontal video shift + GCSettings.yshift = 0; // Vertical video shift GCSettings.WiimoteOrientation = 0; GCSettings.ExitAction = 0; @@ -470,13 +471,23 @@ DefaultSettings () GCSettings.language = LANG_ENGLISH; #endif + GCSettings.LoadMethod = DEVICE_AUTO; // Auto, SD, DVD, USB + GCSettings.SaveMethod = DEVICE_AUTO; // Auto, SD, USB + sprintf (GCSettings.LoadFolder, "%s/roms", APPFOLDER); // Path to game files + sprintf (GCSettings.SaveFolder, "%s/saves", APPFOLDER); // Path to save files + sprintf (GCSettings.CheatFolder, "%s/cheats", APPFOLDER); // Path to cheat files + sprintf (GCSettings.ScreenshotsFolder, "%s/screenshots", APPFOLDER); // Path to screenshot files + sprintf (GCSettings.CoverFolder, "%s/covers", APPFOLDER); // Path to cover files + sprintf (GCSettings.ArtworkFolder, "%s/artwork", APPFOLDER); // Path to artwork files + GCSettings.AutoLoad = 1; // Auto Load SRAM + GCSettings.AutoSave = 1; // Auto Save SRAM + /****************** SNES9x Settings ***********************/ // Default ALL to false memset (&Settings, 0, sizeof (Settings)); // General - Settings.MouseMaster = false; Settings.SuperScopeMaster = false; Settings.JustifierMaster = false; @@ -484,22 +495,21 @@ DefaultSettings () Settings.DontSaveOopsSnapshot = true; Settings.ApplyCheats = true; - Settings.HDMATimingHack = 100; - Settings.BlockInvalidVRAMAccessMaster = true; - + Settings.HDMATimingHack = 100; Settings.IsPatched = 0; + GCSettings.Satellaview = 1; // Enabled by default + // Sound Settings.SoundSync = true; Settings.SixteenBitSound = true; Settings.Stereo = true; + Settings.ReverseStereo = true; Settings.SoundPlaybackRate = 48000; Settings.SoundInputRate = 31920; Settings.DynamicRateControl = true; - Settings.SeparateEchoBuffer = false; - GCSettings.ReverseStereo = 1; // Enabled by default to fix inverted L/R audio channels + GCSettings.MuteAudio = 0; // Disabled by default - // Interpolation Method GCSettings.Interpolation = 0; Settings.InterpolationMethod = DSP_INTERPOLATION_GAUSSIAN; @@ -508,25 +518,31 @@ DefaultSettings () Settings.SkipFrames = AUTO_FRAMERATE; Settings.TurboSkipFrames = 19; Settings.AutoDisplayMessages = false; - Settings.InitialInfoStringTimeout = 200; // # frames to display messages for + Settings.InitialInfoStringTimeout = 200; // # Frames to display messages for Settings.DisplayTime = false; GCSettings.ShowFrameRate = 0; // Disabled by default - GCSettings.HiResolution = 1; // Enabled by default - GCSettings.SpriteLimit = 1; // Enabled by default + GCSettings.HiResMode = 1; // Enabled by default // Frame timings in 50hz and 60hz cpu mode Settings.FrameTimePAL = 20000; Settings.FrameTimeNTSC = 16667; + // Hacks + Settings.BlockInvalidVRAMAccessMaster = true; + Settings.SeparateEchoBuffer = false; + GCSettings.sfxOverclock = 0; - /* Initialize SuperFX CPU to normal speed by default */ + /* Initialize SuperFX to normal speed by default */ Settings.SuperFXSpeedPerLine = 5823405; - Settings.SuperFXClockMultiplier = 100; - Settings.OverclockMode = 0; + + GCSettings.cpuOverclock = 0; + /* Initialize CPU to normal speed by default */ Settings.OneClockCycle = 6; Settings.OneSlowClockCycle = 8; Settings.TwoClockCycles = 12; + + GCSettings.SpriteLimit = 1; // Enabled by default } /**************************************************************************** @@ -733,6 +749,10 @@ bool LoadPrefs() CreateDirectory(dirPath); } + if(GCSettings.videomode > 0) { + ResetVideo_Menu(); + } + ChangeLanguage(); #ifdef HW_RVL diff --git a/source/preferences.h b/source/preferences.h index ef1fc91..3fb1406 100644 --- a/source/preferences.h +++ b/source/preferences.h @@ -2,6 +2,7 @@ * Snes9x Nintendo Wii/GameCube Port * * Tantric 2008-2022 + * Tanooki 2019-2022 * * preferences.h * diff --git a/source/snes9x/memmap.cpp b/source/snes9x/memmap.cpp index 75e57f7..b502766 100644 --- a/source/snes9x/memmap.cpp +++ b/source/snes9x/memmap.cpp @@ -39,6 +39,7 @@ #include "movie.h" #include "display.h" #include "sha256.h" +#include "snapshot.h" #ifdef GEKKO #include "../filebrowser.h" @@ -1419,7 +1420,9 @@ bool8 CMemory::LoadROM (const char *filename) if(!filename || !*filename) return FALSE; - int32 totalFileSize; + S9xResetSaveTimer(FALSE); // reset oops timer here so that .oops file has rom name of previous rom + + int32 totalFileSize; do { @@ -1703,6 +1706,8 @@ bool8 CMemory::LoadMultiCartMem (const uint8 *sourceA, uint32 sourceASize, bool8 CMemory::LoadMultiCart (const char *cartA, const char *cartB) { + S9xResetSaveTimer(FALSE); // reset oops timer here so that .oops file has rom name of previous rom + memset(ROM, 0, MAX_ROM_SIZE); memset(&Multi, 0, sizeof(Multi)); diff --git a/source/snes9xtx.cpp b/source/snes9xtx.cpp index 6aca1bc..975e56e 100644 --- a/source/snes9xtx.cpp +++ b/source/snes9xtx.cpp @@ -5,7 +5,6 @@ * crunchy2 May 2007-July 2007 * Michniewski 2008 * Tantric 2008-2022 - * * Tanooki 2019-2022 * * snes9xtx.cpp @@ -490,6 +489,15 @@ int main(int argc, char *argv[]) if (firstRun) { firstRun = false; + switch (GCSettings.Interpolation) + { + case 0: Settings.InterpolationMethod = DSP_INTERPOLATION_GAUSSIAN; break; + case 1: Settings.InterpolationMethod = DSP_INTERPOLATION_LINEAR; break; + case 2: Settings.InterpolationMethod = DSP_INTERPOLATION_CUBIC; break; + case 3: Settings.InterpolationMethod = DSP_INTERPOLATION_SINC; break; + case 4: Settings.InterpolationMethod = DSP_INTERPOLATION_NONE; break; + } + switch (GCSettings.sfxOverclock) { case 0: Settings.SuperFXSpeedPerLine = 5823405; break; @@ -503,26 +511,41 @@ int main(int argc, char *argv[]) GCSettings.sfxOverclock > 0 ? S9xResetSuperFX() : S9xReset(); - switch (GCSettings.Interpolation) + switch (GCSettings.cpuOverclock) { - case 0: Settings.InterpolationMethod = DSP_INTERPOLATION_GAUSSIAN; break; - case 1: Settings.InterpolationMethod = DSP_INTERPOLATION_LINEAR; break; - case 2: Settings.InterpolationMethod = DSP_INTERPOLATION_CUBIC; break; - case 3: Settings.InterpolationMethod = DSP_INTERPOLATION_SINC; break; - case 4: Settings.InterpolationMethod = DSP_INTERPOLATION_NONE; break; + case 0: + Settings.OneClockCycle = 6; + Settings.OneSlowClockCycle = 8; + Settings.TwoClockCycles = 12; + break; + case 1: + Settings.OneClockCycle = 6; + Settings.OneSlowClockCycle = 6; + Settings.TwoClockCycles = 12; + break; + case 2: + Settings.OneClockCycle = 4; + Settings.OneSlowClockCycle = 5; + Settings.TwoClockCycles = 6; + break; + case 3: + Settings.OneClockCycle = 3; + Settings.OneSlowClockCycle = 3; + Settings.TwoClockCycles = 3; + break; } } - autoboot = false; + autoboot = false; ConfigRequested = 0; ScreenshotRequested = 0; SwitchAudioMode(0); - Settings.ReverseStereo = (GCSettings.ReverseStereo == 1); - Settings.SupportHiRes = (GCSettings.HiResolution == 1); - Settings.MaxSpriteTilesPerLine = (GCSettings.SpriteLimit ? 34 : 128); + Settings.Mute = (GCSettings.MuteAudio == 1); + Settings.SupportHiRes = (GCSettings.HiResMode == 1); Settings.DisplayFrameRate = (GCSettings.ShowFrameRate == 1); Settings.AutoDisplayMessages = (Settings.DisplayFrameRate ? true : false); + Settings.MaxSpriteTilesPerLine = (GCSettings.SpriteLimit ? 34 : 128); Settings.MultiPlayer5Master = (GCSettings.Controller == CTRL_PAD4 ? true : false); Settings.SuperScopeMaster = (GCSettings.Controller == CTRL_SCOPE ? true : false); Settings.MouseMaster = (GCSettings.Controller == CTRL_MOUSE ? true : false); diff --git a/source/snes9xtx.h b/source/snes9xtx.h index dc264fc..3b6937e 100644 --- a/source/snes9xtx.h +++ b/source/snes9xtx.h @@ -5,7 +5,6 @@ * crunchy2 May 2007-July 2007 * Michniewski 2008 * Tantric 2008-2022 - * * Tanooki 2019-2022 * * snes9xtx.h @@ -22,7 +21,7 @@ #include "filelist.h" #define APPNAME "Snes9x TX" -#define APPVERSION "1.1.0" +#define APPVERSION "1.1.2" #define APPFOLDER "snes9xtx" #define PREF_FILE_NAME "settings.xml" @@ -115,32 +114,33 @@ struct SGCSettings{ int HideSRAMSaving; int AutoloadGame; - float zoomHor; // horizontal zoom amount - float zoomVert; // vertical zoom amount + float zoomHor; // Horizontal zoom amount + float zoomVert; // Vertical zoom amount int videomode; // 0 - Automatic, 1 - NTSC (480i), 2 - Progressive (480p), 3 - PAL (50Hz), 4 - PAL (60Hz) - int render; // 0 - Original, 1 - Unfiltered, 2 - Filtered - int FilterMethod; // convert to RenderFilter + int render; // 0 - Default, 1 - 240p Output + int bilinear; // Bilinear filter + int FilterMethod; // Convert to render filter int Controller; - int HiResolution; - int SpriteLimit; - int ShowFrameRate; - int crosshair; int TurboMode; int TurboModeButton; - int widescreen; // 0 - 4:3 aspect, 1 - 16:9 aspect - int xshift; // video output shift + int HiResMode; + int crosshair; + int ShowFrameRate; + int widescreen; + int xshift; // Video output shift int yshift; + int Interpolation; + int MuteAudio; + int sfxOverclock; // 0 - None, 1 - 20 MHz, 2 - 40 MHz, 3 - 60 MHz, 4 - 80 MHz, 5 - 100 MHz, 6 - 120 MHz + int cpuOverclock; // 0 - None, 1 - Low, 2 - Medium, 3 - Max + int SpriteLimit; + int Satellaview; int WiimoteOrientation; int ExitAction; int MusicVolume; int SFXVolume; int language; int PreviewImage; - - int sfxOverclock; - - int ReverseStereo; - int Interpolation; }; void ExitApp(); diff --git a/source/sounds/exit.ogg b/source/sounds/exit.ogg deleted file mode 100644 index f792cb5..0000000 Binary files a/source/sounds/exit.ogg and /dev/null differ diff --git a/source/video.cpp b/source/video.cpp index d32cb9e..a7f674d 100644 --- a/source/video.cpp +++ b/source/video.cpp @@ -5,6 +5,7 @@ * crunchy2 May 2007 * Michniewski 2008 * Tantric 2008-2022 + * Tanooki 2019-2022 * * video.cpp * @@ -106,12 +107,7 @@ static camera cam = { {0.0F, 0.0F, -0.5F} }; -/*** -*** Custom Video modes (used to emulate original console video modes) -***/ - -/** Original SNES PAL Resolutions: **/ - +/*** custom Video modes (used to emulate original console video modes) ***/ /* 239 lines progressive (PAL 50Hz) */ static GXRModeObj TV50hz_239p = { @@ -182,8 +178,6 @@ static GXRModeObj TV50hz_478i = } }; -/** Original SNES NTSC Resolutions: **/ - /* 224 lines progressive (NTSC or PAL 60Hz) */ static GXRModeObj TV60hz_224p = { @@ -258,8 +252,8 @@ static GXRModeObj TV_Custom; /* TV Modes table */ static GXRModeObj *tvmodes[4] = { - &TV60hz_224p, &TV60hz_448i, /* Snes NTSC video modes */ - &TV50hz_239p, &TV50hz_478i /* Snes PAL video modes */ + &TV60hz_224p, &TV60hz_448i, /* 60hz video modes */ + &TV50hz_239p, &TV50hz_478i /* 50hz video modes */ }; /**************************************************************************** @@ -383,7 +377,7 @@ void StopGX() * FindVideoMode * * Finds the optimal video mode, or uses the user-specified one - * Also configures original video modes + * Also configures rendering modes ***************************************************************************/ static GXRModeObj * FindVideoMode() { @@ -418,14 +412,13 @@ static GXRModeObj * FindVideoMode() break; } - // configure original modes + // configure rendering modes switch (mode->viTVMode >> 2) { case VI_PAL: // 576 lines (PAL 50Hz) vmode_60hz = false; - // Original Video modes (forced to PAL 50Hz) // set video signal mode TV60hz_224p.viTVMode = VI_TVMODE_PAL_DS; TV60hz_448i.viTVMode = VI_TVMODE_PAL_INT; @@ -438,7 +431,6 @@ static GXRModeObj * FindVideoMode() // 480 lines (NTSC 60Hz) vmode_60hz = true; - // Original Video modes (forced to NTSC 60hz) // set video signal mode TV50hz_239p.viTVMode = VI_TVMODE_NTSC_DS; TV50hz_478i.viTVMode = VI_TVMODE_NTSC_INT; @@ -455,7 +447,6 @@ static GXRModeObj * FindVideoMode() // 480 lines (PAL 60Hz) vmode_60hz = true; - // Original Video modes (forced to PAL 60hz) // set video signal mode TV50hz_239p.viTVMode = VI_TVMODE(mode->viTVMode >> 2, VI_NON_INTERLACE); TV50hz_478i.viTVMode = VI_TVMODE(mode->viTVMode >> 2, VI_INTERLACE); @@ -599,8 +590,8 @@ ResetVideo_Emu () Mtx44 p; int i = -1; - // original render mode or filtering - if (GCSettings.render == 0) + // 240p output or filtering + if (GCSettings.render == 1) { for (int j=0; j<4; j++) { @@ -612,7 +603,7 @@ ResetVideo_Emu () } } - if(i >= 0) // we found a matching original mode + if(i >= 0) { rmode = tvmodes[i]; @@ -757,7 +748,7 @@ update_video (int width, int height) memset(filtermem, 0, FILTERMEM_SIZE); #endif /** Update scaling **/ - if (GCSettings.render == 0) // original render mode + if (GCSettings.render == 1) // 240p render mode { if (GCSettings.FilterMethod != FILTER_NONE && vheight <= 239 && vwidth <= 256) { // filters; normal operation @@ -771,7 +762,7 @@ update_video (int width, int height) yscale = vheight / 2; } } - else // unfiltered and filtered mode + else // default rendering mode { xscale = 256; @@ -783,7 +774,7 @@ update_video (int width, int height) if (GCSettings.widescreen) { - if(GCSettings.render == 0) + if(GCSettings.render == 1) xscale = (3*xscale)/4; else xscale = 256; // match the original console's width for "widescreen" to prevent flickering @@ -802,8 +793,8 @@ update_video (int width, int height) // initialize the texture obj we are going to use GX_InitTexObj (&texobj, texturemem, vwidth*fscale, vheight*fscale, GX_TF_RGB565, GX_CLAMP, GX_CLAMP, GX_FALSE); - if (GCSettings.render == 0 || GCSettings.render == 1) - GX_InitTexObjLOD(&texobj,GX_NEAR,GX_NEAR_MIP_NEAR,2.5,9.0,0.0,GX_FALSE,GX_FALSE,GX_ANISO_1); // original/unfiltered video mode: force texture filtering OFF + if (GCSettings.bilinear == 0) + GX_InitTexObjLOD(&texobj,GX_NEAR,GX_NEAR_MIP_NEAR,2.5,9.0,0.0,GX_FALSE,GX_FALSE,GX_ANISO_1); // bilinear filtering OFF GX_LoadTexObj (&texobj, GX_TEXMAP0); // load texture object so its ready to use @@ -833,10 +824,10 @@ update_video (int width, int height) if(ScreenshotRequested) { - if(GCSettings.render == 0) // we can't take a screenshot in Original mode + if(GCSettings.render == 1) // we can't take a screenshot in 240p rendering mode { - oldRenderMode = 0; - GCSettings.render = 1; // switch to unfiltered mode + oldRenderMode = 1; + GCSettings.render = 0; // switch to default rendering mode CheckVideo = 1; // request the switch } else diff --git a/source/video.h b/source/video.h index 39263fc..8bf6712 100644 --- a/source/video.h +++ b/source/video.h @@ -4,6 +4,7 @@ * softdev July 2006 * Michniewski 2008 * Tantric 2008-2022 + * Tanooki 2019-2022 * * video.h *