diff --git a/source/ngc/FreeTypeGX.cpp b/source/ngc/FreeTypeGX.cpp index ca9740e..dffbf36 100644 --- a/source/ngc/FreeTypeGX.cpp +++ b/source/ngc/FreeTypeGX.cpp @@ -65,12 +65,18 @@ void ClearFontData() wchar_t* charToWideChar(const char* strChar) { - wchar_t *strWChar; - strWChar = new wchar_t[strlen(strChar) + 1]; + wchar_t *strWChar = new(std::nothrow) wchar_t[strlen(strChar) + 1]; + if(!strWChar) + return NULL; - char *tempSrc = (char *)strChar; + int bt = mbstowcs(strWChar, strChar, strlen(strChar)); + if (bt > 0) + { + strWChar[bt] = (wchar_t)'\0'; + return strWChar; + } wchar_t *tempDest = strWChar; - while((*tempDest++ = *tempSrc++)); + while ((*tempDest++ = *strChar++)); return strWChar; } diff --git a/source/ngc/filelist.h b/source/ngc/filelist.h index dd63922..2d377f0 100644 --- a/source/ngc/filelist.h +++ b/source/ngc/filelist.h @@ -123,6 +123,12 @@ extern const u32 button_png_size; extern const u8 button_over_png[]; extern const u32 button_over_png_size; +extern const u8 button_long_png[]; +extern const u32 button_long_png_size; + +extern const u8 button_long_over_png[]; +extern const u32 button_long_over_png_size; + extern const u8 button_short_png[]; extern const u32 button_short_png_size; diff --git a/source/ngc/gui/gui_button.cpp b/source/ngc/gui/gui_button.cpp index 3b4dd5e..3ae6023 100644 --- a/source/ngc/gui/gui_button.cpp +++ b/source/ngc/gui/gui_button.cpp @@ -199,6 +199,8 @@ void GuiButton::ResetText() if(labelOver[i]) labelOver[i]->ResetText(); } + if(tooltip) + tooltip->ResetText(); } void GuiButton::Update(GuiTrigger * t) diff --git a/source/ngc/gui/gui_optionbrowser.cpp b/source/ngc/gui/gui_optionbrowser.cpp index 616a529..7dbeb2e 100644 --- a/source/ngc/gui/gui_optionbrowser.cpp +++ b/source/ngc/gui/gui_optionbrowser.cpp @@ -77,11 +77,11 @@ GuiOptionBrowser::GuiOptionBrowser(int w, int h, OptionList * l) for(int i=0; iSetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); optionTxt[i]->SetPosition(8,0); - optionVal[i] = new GuiText(NULL, 22, (GXColor){0, 0, 0, 0xff}); + optionVal[i] = new GuiText(NULL, 20, (GXColor){0, 0, 0, 0xff}); optionVal[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); optionVal[i]->SetPosition(250,0); diff --git a/source/ngc/gui/gui_savebrowser.cpp b/source/ngc/gui/gui_savebrowser.cpp index e26d529..3824948 100644 --- a/source/ngc/gui/gui_savebrowser.cpp +++ b/source/ngc/gui/gui_savebrowser.cpp @@ -81,14 +81,14 @@ GuiSaveBrowser::GuiSaveBrowser(int w, int h, SaveList * s, int a) for(int i=0; iSetAlignment(ALIGN_LEFT, ALIGN_TOP); saveDate[i]->SetPosition(80,5); - saveTime[i] = new GuiText(NULL, 22, (GXColor){0, 0, 0, 0xff}); + saveTime[i] = new GuiText(NULL, 18, (GXColor){0, 0, 0, 0xff}); saveTime[i]->SetAlignment(ALIGN_LEFT, ALIGN_TOP); saveTime[i]->SetPosition(80,27); - saveType[i] = new GuiText(NULL, 22, (GXColor){0, 0, 0, 0xff}); + saveType[i] = new GuiText(NULL, 18, (GXColor){0, 0, 0, 0xff}); saveType[i]->SetAlignment(ALIGN_LEFT, ALIGN_TOP); saveType[i]->SetPosition(80,50); @@ -321,10 +321,10 @@ void GuiSaveBrowser::Update(GuiTrigger * t) { saveDate[0]->SetText(NULL); saveDate[1]->SetText(NULL); - saveTime[0]->SetText("New SRAM"); - saveTime[1]->SetText("New Snapshot"); - saveType[0]->SetText(NULL); - saveType[1]->SetText(NULL); + saveTime[0]->SetText("New"); + saveTime[1]->SetText("New"); + saveType[0]->SetText("SRAM"); + saveType[1]->SetText("Snapshot"); savePreviewImg[0]->SetImage(gameSaveBlank); savePreviewImg[1]->SetImage(gameSaveBlank); savePreviewImg[0]->SetScale(1); diff --git a/source/ngc/images/button_long.png b/source/ngc/images/button_long.png new file mode 100644 index 0000000..82fa9a2 Binary files /dev/null and b/source/ngc/images/button_long.png differ diff --git a/source/ngc/images/button_long_over.png b/source/ngc/images/button_long_over.png new file mode 100644 index 0000000..5674c94 Binary files /dev/null and b/source/ngc/images/button_long_over.png differ diff --git a/source/ngc/images/button_short.png b/source/ngc/images/button_short.png index 6d212da..487ee9a 100644 Binary files a/source/ngc/images/button_short.png and b/source/ngc/images/button_short.png differ diff --git a/source/ngc/images/button_short_over.png b/source/ngc/images/button_short_over.png index aa4a938..9fc69f0 100644 Binary files a/source/ngc/images/button_short_over.png and b/source/ngc/images/button_short_over.png differ diff --git a/source/ngc/lang/de.lang b/source/ngc/lang/de.lang index 85d8364..11e36ef 100644 --- a/source/ngc/lang/de.lang +++ b/source/ngc/lang/de.lang @@ -1,2 +1,470 @@ -msgid " " +msgid "&" msgstr "" + +msgid "16:9 Correction" +msgstr "16:9" + +msgid "Aim Offscreen" +msgstr "Neben Bildsch. zielen" + +msgid "An update is available!" +msgstr "Ein Update ist verfügbar!" + +msgid "Are you sure that you want to reset this game? Any unsaved progress will be lost." +msgstr "Bist du sicher das du das Spiel zurücksetzen willst? Ungespeicherter Fortschritt geht verloren." + +msgid "Are you sure that you want to reset your mappings?" +msgstr "Bist du sicher das du deine Tastenbelegung zurücksetzten willst?" + +msgid "Are you sure that you want to reset your settings?" +msgstr "Bist du sicher das du die Einstellungen zurücksetzten willst?" + +msgid "Auto" +msgstr "" + +msgid "Auto Detect" +msgstr "Auto. feststellen" + +msgid "Auto Load" +msgstr "Auto. laden" + +msgid "Auto Save" +msgstr "Auto. speichern" + +msgid "Automatic (Recommended)" +msgstr "Automatisch (Empfohlen)" + +msgid "Back" +msgstr "Zurück" + +msgid "Both" +msgstr "Beide" + +msgid "Button Mapping" +msgstr "Tastenbelegung" + +msgid "Button Mappings" +msgstr "Tasten Belegung" + +msgid "Cancel" +msgstr "Abbrechen" + +msgid "Caps" +msgstr "" + +msgid "Cheats" +msgstr "" + +msgid "Cheats file not found!" +msgstr "Cheatdatei nicht gefunden!" + +msgid "Cheats Folder" +msgstr "Ordner f. Cheats" + +msgid "Choose Game" +msgstr "Spiel auswählen" + +msgid "Classic Controller" +msgstr "" + +msgid "Close" +msgstr "Schließen" + +msgid "Coding" +msgstr "Programmierung" + +msgid "Coding & menu design" +msgstr "Programmierung & Menüdesign" + +msgid "Controller" +msgstr "" + +msgid "Cover View" +msgstr "Cover anzeigen" + +msgid "Covers Folder" +msgstr "Ordner f. Cover" + +msgid "Credits" +msgstr "" + +msgid "Cursor" +msgstr "Eingabezeiger" + +msgid "Default" +msgstr "Standard" + +msgid "Disabled" +msgstr "Deaktiviert" + +msgid "distributed, or modified under the terms of the" +msgstr "veröffentlich, oder verändert unter den Bedingungen der" + +msgid "Don't Save" +msgstr "Nicht speichern" + +msgid "Down" +msgstr "Unten" + +msgid "DOWN" +msgstr "UNTEN" + +msgid "Enabled" +msgstr "Aktiviert" + +msgid "Error" +msgstr "Fehler" + +msgid "Exit" +msgstr "Beenden" + +msgid "Exit Action" +msgstr "Aktion beim Beenden" + +msgid "Filtered" +msgstr "Gefiltert" + +msgid "Filtering" +msgstr "Filter" + +msgid "Fire" +msgstr "Schießen" + +msgid "Game Settings" +msgstr "Spiel Einstellungen" + +msgid "Game Settings - Button Mappings" +msgstr "Spieleinstellungen - Tastenbelegung" + +msgid "Game Settings - Cheats" +msgstr "Spieleinstellungen - Cheats" + +msgid "Game Settings - Video" +msgstr "Spieleinstellungen - Video" + +msgid "GameCube Controller" +msgstr "" + +msgid "GNU General Public License (GPL) Version 2." +msgstr "" + +msgid "Go Back" +msgstr "Zurück" + +msgid "Horizontal" +msgstr "" + +msgid "Information" +msgstr "" + +msgid "Justifier" +msgstr "" + +msgid "Language" +msgstr "Sprache" + +msgid "Languages Folder" +msgstr "Ordner f. Sprachen" + +msgid "Left" +msgstr "Links" + +msgid "LEFT" +msgstr "LINKS" + +msgid "Left Button" +msgstr "Linke Taste" + +msgid "Load" +msgstr "Laden" + +msgid "Load Device" +msgstr "Startgerät" + +msgid "Load Folder" +msgstr "Ordner f. ROMs" + +msgid "Load Game" +msgstr "Spiel laden" + +msgid "Loading" +msgstr "Laden" + +msgid "Main Menu" +msgstr "Hauptmenü" + +msgid "Menu" +msgstr "Menü" + +msgid "Menu artwork" +msgstr "Menü Artwork" + +msgid "Menu sound" +msgstr "Menü Sound" + +msgid "MINUS" +msgstr "" + +msgid "Music Volume" +msgstr "Musik Lautstärke" + +msgid "Mute" +msgstr "Stumm" + +msgid "Network" +msgstr "Netzwerk" + +msgid "New" +msgstr "Neuer" + +msgid "No" +msgstr "Nein" + +msgid "None" +msgstr "Nichts" + +msgid "No game saves found." +msgstr "Kein Spielstand gefunden." + +msgid "NTSC (480i)" +msgstr "" + +msgid "Nunchuk" +msgstr "" + +msgid "Off" +msgstr "Aus" + +msgid "Official Site: http://code.google.com/p/snes9x-gx/" +msgstr "Offizielle Seite: http://code.google.com/p/snes9x-gx/" + +msgid "OK" +msgstr "" + +msgid "On" +msgstr "An" + +msgid "Original" +msgstr "" + +msgid "PAL (50Hz)" +msgstr "" + +msgid "PAL (60Hz)" +msgstr "" + +msgid "Pause" +msgstr "" + +msgid "Please Wait" +msgstr "Bitte Warten" + +msgid "PLUS" +msgstr "" + +msgid "Power off Wii" +msgstr "Wii ausschalten" + +msgid "Press any button on the Classic Controller now. Press Home to clear the existing mapping." +msgstr "Drücke jetzt eine Taste auf dem Classic Controller. Drücke HOME um die vorhandene Belegung zu löschen." + +msgid "Press any button on the GameCube Controller now. Press Home or the C-Stick in any direction to clear the existing mapping." +msgstr "Drücke jetzt eine Taste auf dem GameCube Controller. Drücke HOME oder den C-Stick in eine beliebige Richtung um die vorhandene Belegung zu löschen." + +msgid "Press any button on the GameCube Controller now. Press the C-Stick in any direction to clear the existing mapping." +msgstr "Drücke jetzt eine Taste auf dem GameCube Controller. Drücke den C-Stick in eine beliebige Richtung um die vorhandene Belegung zu löschen." + +msgid "Press any button on the Wiimote now. Press Home to clear the existing mapping." +msgstr "Drücke jetzt eine Taste auf der Wii-FB. Drücke HOME um die vorhandene Belegung zu löschen." + +msgid "Press any button on the Wiimote or Nunchuk now. Press Home to clear the existing mapping." +msgstr "Drücke jetzt eine Taste auf der Wii-FB oder dem Nunchuk. Drücke HOME um die vorhandene Belegung zu löschen." + +msgid "Progressive (480p)" +msgstr "" + +msgid "Quit Game" +msgstr "Spiel beenden" + +msgid "Quit this game? Any unsaved progress will be lost." +msgstr "Dieses Spiel beenden? Ungespeicherter Fortschritt geht verloren." + +msgid "Reboot" +msgstr "Neustart" + +msgid "Rendering" +msgstr "Darstellung" + +msgid "Reset" +msgstr "Zurücksetzen" + +msgid "Reset Game" +msgstr "Spiel zurücksetzen" + +msgid "Reset Mappings" +msgstr "Belegung zurücksetzen" + +msgid "Reset Settings" +msgstr "Zurücksetzen" + +msgid "Retry" +msgstr "Wiederholen" + +msgid "Return to Loader" +msgstr "Zum Loader zurückkehren" + +msgid "Return to Wii Menu" +msgstr "Zum Wii Menü zurückkehren" + +msgid "Right" +msgstr "Rechts" + +msgid "RIGHT" +msgstr "RECHTS" + +msgid "Right Button" +msgstr "Rechte Taste" + +msgid "Rumble" +msgstr "" + +msgid "Save" +msgstr "Speichern" + +msgid "Save Device" +msgstr "Speichergerät" + +msgid "Save Folder" +msgstr "Ordner f. Spielstände" + +msgid "Save Game" +msgstr "Spiel speichern" + +msgid "Save Snapshot?" +msgstr "Schnappschuss speichern?" + +msgid "Save SRAM and Snapshot?" +msgstr "SRAM und Schnappschuss speichern?" + +msgid "Save successful" +msgstr "Erfolgreich gespeichert" + +msgid "Saving" +msgstr "Speichern" + +msgid "Scaling" +msgstr "Auflösung" + +msgid "Screen Position" +msgstr "Bildschirm Position" + +msgid "Screen Zoom" +msgstr "Bildschirm Zoom" + +msgid "Select" +msgstr "" + +msgid "Settings" +msgstr "Einstellungen" + +msgid "Settings - Menu" +msgstr "Einstellungen - Menü" + +msgid "Settings - Network" +msgstr "Einstellungen - Netzwerk" + +msgid "Settings - Saving & Loading" +msgstr "Einstellungen - Speichern & Laden" + +msgid "Shift" +msgstr "" + +msgid "SMB Share IP" +msgstr "" + +msgid "SMB Share Name" +msgstr "" + +msgid "SMB Share Password" +msgstr "SMB Share Passwort" + +msgid "SMB Share Username" +msgstr "SMB Share Benutzername" + +msgid "Snapshot" +msgstr "Schnappschuss" + +msgid "SNES Controller" +msgstr "" + +msgid "SNES Controllers (2)" +msgstr "" + +msgid "SNES Controllers (4)" +msgstr "" + +msgid "SNES Mouse" +msgstr "SNES Maus" + +msgid "Snes9x - Copyright (c) Snes9x Team 1996 - 2006" +msgstr "" + +msgid "Sound Effects Volume" +msgstr "SFX Lautstärke" + +msgid "Start" +msgstr "" + +msgid "START" +msgstr "" + +msgid "Super Scope" +msgstr "" + +msgid "This software is open source and may be copied," +msgstr "Diese Software ist Open Source und evtl. kopiert," + +msgid "Turbo On" +msgstr "Turbo an" + +msgid "Turbo Off" +msgstr "Turbo aus" + +msgid "Unfiltered" +msgstr "Ungefiltert" + +msgid "Up" +msgstr "Oben" + +msgid "UP" +msgstr "OBEN" + +msgid "Up One Level" +msgstr "Eine Ebene nach oben" + +msgid "Update Available" +msgstr "Update verfügbar" + +msgid "Update later" +msgstr "Später updaten" + +msgid "Update now" +msgstr "Jetzt updaten" + +msgid "Vertical" +msgstr "Vertikal" + +msgid "Video" +msgstr "Bild" + +msgid "Video Mode" +msgstr "Videomodus" + +msgid "Wiimote" +msgstr "Wii-FB" + +msgid "Wiimote Orientation" +msgstr "Wii-FB Ausrichtung" + +msgid "Yes" +msgstr "Ja" diff --git a/source/ngc/lang/es.lang b/source/ngc/lang/es.lang index 85d8364..ad7b51c 100644 --- a/source/ngc/lang/es.lang +++ b/source/ngc/lang/es.lang @@ -1,2 +1,392 @@ -msgid " " +msgid "&" msgstr "" + +msgid "16:9 Correction" +msgstr "Correccin 16:9" + +msgid "An update is available!" +msgstr "Actualizacin disponible!" + +msgid "Are you sure that you want to reset this game? Any unsaved progress will be lost." +msgstr "Seguro que desea reiniciar este juego? Se perder cualquier progreso no salvado." + +msgid "Are you sure that you want to reset your mappings?" +msgstr "Seguro que desea reinicializar los controles?" + +msgid "Are you sure that you want to reset your settings?" +msgstr "Seguro que desea reinicializar la configuracin?" + +msgid "Auto" +msgstr "Auto" + +msgid "Auto Detect" +msgstr "Auto Detect." + +msgid "Auto Load" +msgstr "Auto Cargar" + +msgid "Auto Save" +msgstr "Auto Salvar" + +msgid "Automatic (Recommended)" +msgstr "Automtico (Recomendado)" + +msgid "Back" +msgstr "Atrs" + +msgid "Both" +msgstr "Ambos" + +msgid "Button Mapping" +msgstr "Controles" + +msgid "Button Mappings" +msgstr "Redefinir Controles" + +msgid "Cancel" +msgstr "Cancelar" + +msgid "Caps" +msgstr "" + +msgid "Cheats" +msgstr "Cheats" + +msgid "Cheats file not found!" +msgstr "Cheats no encontrado!" + +msgid "Cheats Folder" +msgstr "Carpeta Cheats" + +msgid "Choose Game" +msgstr "Elegir Juego" + +msgid "Classic Controller" +msgstr "Mando Clsico" + +msgid "Close" +msgstr "Cerrar" + +msgid "Coding" +msgstr "Programacin" + +msgid "Coding & menu design" +msgstr "Cdigo & diseo de men" + +msgid "Controller" +msgstr "Mando" + +msgid "Cover View" +msgstr "Vista Portada" + +msgid "Covers Folder" +msgstr "Carpeta Portadas" + +msgid "Credits" +msgstr "Crditos" + +msgid "Default" +msgstr "Por defecto" + +msgid "Disabled" +msgstr "Deshabilitado" + +msgid "distributed, or modified under the terms of the" +msgstr "distribuido, o modificado bajo los trminos de" + +msgid "Don't Save" +msgstr "No Salvar" + +msgid "Enabled" +msgstr "Habilitado" + +msgid "Error" +msgstr "Error" + +msgid "Exit" +msgstr "Salir" + +msgid "Exit Action" +msgstr "Accin de Salir" + +msgid "Filtered" +msgstr "Filtrado" + +msgid "Filtering" +msgstr "Filtrar" + +msgid "Game Settings" +msgstr "Configuracin" + +msgid "Game Settings - Button Mappings" +msgstr "Configuracin - Redefinir Controles" + +msgid "Game Settings - Cheats" +msgstr "Configuracin - Cheats" + +msgid "Game Settings - Video" +msgstr "Configuracin - Vdeo" + +msgid "GameCube Controller" +msgstr "Mando de GameCube" + +msgid "GNU General Public License (GPL) Version 2." +msgstr "GNU General Public License (GPL) Versin 2." + +msgid "Go Back" +msgstr "Volver" + +msgid "Horizontal" +msgstr "" + +msgid "Information" +msgstr "Informacin" + +msgid "Justifier" +msgstr "Justificado" + +msgid "Language" +msgstr "Idioma" + +msgid "Languages Folder" +msgstr "Carpeta Idiomas" + +msgid "Load" +msgstr "Cargar" + +msgid "Load Device" +msgstr "Cargar Dispositivo" + +msgid "Load Folder" +msgstr "Cargar Carpeta" + +msgid "Load Game" +msgstr "Cargar Juego" + +msgid "Loading" +msgstr "Cargando" + +msgid "Main Menu" +msgstr "Men Principal" + +msgid "Menu" +msgstr "Men" + +msgid "Menu artwork" +msgstr "Artwork del men" + +msgid "Menu sound" +msgstr "Sonido del men" + +msgid "Music Volume" +msgstr "Volumen Msica" + +msgid "Mute" +msgstr "Silenciar" + +msgid "Network" +msgstr "Red" + +msgid "No" +msgstr "No" + +msgid "No game saves found." +msgstr "No hay partidas salvadas." + +msgid "NTSC (480i)" +msgstr "" + +msgid "Nunchuk" +msgstr "" + +msgid "Off" +msgstr "" + +msgid "Official Site: http://code.google.com/p/snes9x-gx/" +msgstr "Sitio Oficial: http://code.google.com/p/snes9x-gx/" + +msgid "OK" +msgstr "" + +msgid "On" +msgstr "" + +msgid "Original" +msgstr "" + +msgid "PAL (50Hz)" +msgstr "" + +msgid "PAL (60Hz)" +msgstr "" + +msgid "Please Wait" +msgstr "Espere, por favor" + +msgid "Power off Wii" +msgstr "Apagar Wii" + +msgid "Press any button on the Classic Controller now. Press Home to clear the existing mapping." +msgstr "Presione un botn en el Mando Clsico. Presione HOME para eliminar la configuracin actual." + +msgid "Press any button on the GameCube Controller now. Press Home or the C-Stick in any direction to clear the existing mapping." +msgstr "Presione un botn en el Mando de GameCube. Presione HOME o mueva el el Stick-C para eliminar la configuracin actual." + +msgid "Press any button on the GameCube Controller now. Press the C-Stick in any direction to clear the existing mapping." +msgstr "Presione un botn en el Mando de GameCube. Presione HOME o mueva el el Stick-C para eliminar la configuracin actual." + +msgid "Press any button on the Wiimote now. Press Home to clear the existing mapping." +msgstr "Presione un botn en el Wiimote. Presione HOME para eliminar la configuracin actual." + +msgid "Press any button on the Wiimote or Nunchuk now. Press Home to clear the existing mapping." +msgstr "Presione un botn en el Wiimote o Nunchuck. Presione HOME para eliminar la configuracin actual." + +msgid "Progressive (480p)" +msgstr "Progresivo (480p)" + +msgid "Quit Game" +msgstr "Salir" + +msgid "Quit this game? Any unsaved progress will be lost." +msgstr "Salir? Se perder cualquier progreso no salvado." + +msgid "Reboot" +msgstr "Reiniciar" + +msgid "Rendering" +msgstr "Renderizado" + +msgid "Reset" +msgstr "Reinicializar" + +msgid "Reset Game" +msgstr "Reinicializar" + +msgid "Reset Mappings" +msgstr "Reinicializar" + +msgid "Reset Settings" +msgstr "Reinicializar" + +msgid "Retry" +msgstr "Reintentar" + +msgid "Return to Loader" +msgstr "Volver al Loader" + +msgid "Return to Wii Menu" +msgstr "Volver al men de Wii" + +msgid "Rumble" +msgstr "Vibracin" + +msgid "Save" +msgstr "Salvar" + +msgid "Save Device" +msgstr "Salvar Dispositivo" + +msgid "Save Folder" +msgstr "Salvar Carpeta" + +msgid "Save Game" +msgstr "Salvar Juego" + +msgid "Save Snapshot?" +msgstr "Salvar Instantnea?" + +msgid "Save SRAM and Snapshot?" +msgstr "Salvar SRAM e Instantnea?" + +msgid "Saving" +msgstr "Grabando" + +msgid "Scaling" +msgstr "Scaling" + +msgid "Screen Position" +msgstr "Posicin Pantalla" + +msgid "Screen Zoom" +msgstr "Zoom Pantalla" + +msgid "Settings" +msgstr "Configuracin" + +msgid "Settings - Menu" +msgstr "Configuracin - Men" + +msgid "Settings - Network" +msgstr "Configuracin - Red" + +msgid "Settings - Saving & Loading" +msgstr "Configuracin - Grabar y Cargar" + +msgid "Shift" +msgstr "Mays." + +msgid "SMB Share IP" +msgstr "IP del SMB" + +msgid "SMB Share Name" +msgstr "Nombre del SMB" + +msgid "SMB Share Password" +msgstr "Contrasea del SMB" + +msgid "SMB Share Username" +msgstr "Usuario del SMB" + +msgid "Snapshot" +msgstr "Instantnea" + +msgid "SNES Controller" +msgstr "Mando de SNES" + +msgid "SNES Mouse" +msgstr "Ratn de SNES" + +msgid "Snes9x - Copyright (c) Snes9x Team 1996 - 2006" +msgstr "" + +msgid "Sound Effects Volume" +msgstr "Volumen Efectos" + +msgid "Super Scope" +msgstr "" + +msgid "This software is open source and may be copied," +msgstr "Este software es de cdigo abierto y puede ser copiado," + +msgid "Unfiltered" +msgstr "No filtrado" + +msgid "Up One Level" +msgstr "Subir Nivel" + +msgid "Update Available" +msgstr "Actualizacin disponible" + +msgid "Update later" +msgstr "Actualizar despus" + +msgid "Update now" +msgstr "Actualizar ya" + +msgid "Vertical" +msgstr "" + +msgid "Video" +msgstr "Vdeo" + +msgid "Video Mode" +msgstr "Modo de Vdeo" + +msgid "Wiimote" +msgstr "" + +msgid "Wiimote Orientation" +msgstr "Orientacin del Wiimote" + +msgid "Yes" +msgstr "S" \ No newline at end of file diff --git a/source/ngc/lang/fr.lang b/source/ngc/lang/fr.lang index 85d8364..a6bcdff 100644 --- a/source/ngc/lang/fr.lang +++ b/source/ngc/lang/fr.lang @@ -1,2 +1,444 @@ msgid " " -msgstr "" +msgstr " " + +msgid "&" +msgstr "&" + +msgid "16:9 Correction" +msgstr "Correction 16:9" + +msgid "An update is available!" +msgstr "Une mise à jour est disponible!" + +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." + +msgid "Are you sure that you want to reset your mappings?" +msgstr "Êtes-vous sûr de vouloir réinitialiser les touches?" + +msgid "Are you sure that you want to reset your settings?" +msgstr "Êtes-vous sûr de vouloir réinitialiser les paramètres?" + +msgid "Auto" +msgstr "Auto" + +msgid "Auto Detect" +msgstr "Détection Auto" + +msgid "Auto Load" +msgstr "Chargement Auto" + +msgid "Auto Save" +msgstr "Sauvegarde Auto" + +msgid "Automatic (Recommended)" +msgstr "Automatique (Recommandé)" + +msgid "Back" +msgstr "Retour" + +msgid "Both" +msgstr "Les deux" + +msgid "Button Mapping" +msgstr "Contrôles" + +msgid "Button Mappings" +msgstr "Redéfinir les touches" + +msgid "Cancel" +msgstr "Annuler" + +msgid "Caps" +msgstr "Verr.Maj" + +msgid "Cheats" +msgstr "Cheats" + +msgid "Cheats file not found!" +msgstr "Fichier Cheats non trouvé!" + +msgid "Cheats Folder" +msgstr "Dossier Cheats" + +msgid "Choose Game" +msgstr "Choisir un jeu" + +msgid "Classic Controller" +msgstr "Manette Classique" + +msgid "Close" +msgstr "Fermer" + +msgid "Coding" +msgstr "Programmation" + +msgid "Coding & menu design" +msgstr "Program. & design du menu" + +msgid "Controller" +msgstr "Contrôleur" + +msgid "Cover View" +msgstr "Vue Jaquette" + +msgid "Covers Folder" +msgstr "Dossier des jaquettes" + +msgid "Credits" +msgstr "Crédits" + +msgid "Default" +msgstr "Par défaut" + +msgid "Disabled" +msgstr "Désactivé" + +msgid "distributed, or modified under the terms of the" +msgstr "distribuée, ou modifiée selon les termes de" + +msgid "Don't Save" +msgstr "Ne pas sauver" + +msgid "Down" +msgstr "Bas" + +msgid "DOWN" +msgstr "BAS" + +msgid "Enabled" +msgstr "Activé" + +msgid "Error" +msgstr "Erreur" + +msgid "Exit" +msgstr "Sortir" + +msgid "Exit Action" +msgstr "Sortie de SNES9xGx" + +msgid "Filtered" +msgstr "Filtré" + +msgid "Filtering" +msgstr "Filtrage" + +msgid "Game Settings" +msgstr "Configuration" + +msgid "Game Settings - Button Mappings" +msgstr "Configuration - Redéfinir les touches" + +msgid "Game Settings - Cheats" +msgstr "Configuration - Cheats" + +msgid "Game Settings - Video" +msgstr "Configuration - Vidéo" + +msgid "GameCube Controller" +msgstr "Manette Gamecube" + +msgid "GNU General Public License (GPL) Version 2." +msgstr "la Licence Publique Générale (GPL) GNU Version 2." + +msgid "Go Back" +msgstr "Retour" + +msgid "Horizontal" +msgstr "Horizontal" + +msgid "Information" +msgstr "Information" + +msgid "Justifier" +msgstr "Justifier" + +msgid "Language" +msgstr "Langage" + +msgid "Languages Folder" +msgstr "Dossier des Langues" + +msgid "Left" +msgstr "Gauche" + +msgid "LEFT" +msgstr "GAUCHE" + +msgid "Load" +msgstr "Charger" + +msgid "Load Device" +msgstr "Périphérique d'entrée" + +msgid "Load Folder" +msgstr "Dossier des Jeux" + +msgid "Load Game" +msgstr "Charger une partie" + +msgid "Loading" +msgstr "Chargement" + +msgid "Main Menu" +msgstr "Menu Principal" + +msgid "Menu" +msgstr "Menu" + +msgid "Menu artwork" +msgstr "Menu artwork" + +msgid "Menu sound" +msgstr "Menu Son" + +msgid "MINUS" +msgstr "MOINS" + +msgid "Music Volume" +msgstr "Volume de la Musique" + +msgid "Mute" +msgstr "Muet" + +msgid "Network" +msgstr "Réseau" + +msgid "New" +msgstr "Nouv." + +msgid "No" +msgstr "Non" + +msgid "None" +msgstr "Aucun" + +msgid "No game saves found." +msgstr "Aucune sauvegarde trouvée." + +msgid "NTSC (480i)" +msgstr "NTSC (480i)" + +msgid "Nunchuk" +msgstr "Nunchuk" + +msgid "Off" +msgstr "Off" + +msgid "Official Site: http://code.google.com/p/snes9x-gx/" +msgstr "Site Officiel: http://code.google.com/p/snes9x-gx/" + +msgid "OK" +msgstr "OK" + +msgid "On" +msgstr "On" + +msgid "Original" +msgstr "Original" + +msgid "PAL (50Hz)" +msgstr "PAL (50Hz)" + +msgid "PAL (60Hz)" +msgstr "PAL (60Hz)" + +msgid "Please Wait" +msgstr "Veuillez patienter" + +msgid "PLUS" +msgstr "PLUS" + +msgid "Power off Wii" +msgstr "Eteindre la Wii" + +msgid "Press any button on the Classic Controller now. Press Home to clear the existing mapping." +msgstr "Appuyer sur un bouton de la manette Classique. Appuyer sur HOME pour effacer le paramètre actuel." + +msgid "Press any button on the GameCube Controller now. Press Home or the C-Stick in any direction to clear the existing mapping." +msgstr "Presser un bouton de la manette Gamecube. Presser HOME ou le stick C pour effacer le paramètre actuel." + +msgid "Press any button on the GameCube Controller now. Press the C-Stick in any direction to clear the existing mapping." +msgstr "Presser un bouton de la manette Gamecube. Presser une direction du stick C pour effacer le paramètre actuel." + +msgid "Press any button on the Wiimote now. Press Home to clear the existing mapping." +msgstr "Presser un bouton de la Wiimote. Presser HOME pour effacer le paramètre actuel." + +msgid "Press any button on the Wiimote or Nunchuk now. Press Home to clear the existing mapping." +msgstr "Presser un bouton de la Wiimote ou du Nunchuk. Presser HOME pour effacer le paramètre actuel." + +msgid "Progressive (480p)" +msgstr "Progressif (480p)" + +msgid "Quit Game" +msgstr "Quitter le Jeu" + +msgid "Quit this game? Any unsaved progress will be lost." +msgstr "Quitter ce jeu ? Toute progression non sauvegardée sera perdue." + +msgid "Reboot" +msgstr "Redémarrer" + +msgid "Rendering" +msgstr "Rendu" + +msgid "Reset" +msgstr "Réinitialiser" + +msgid "Reset Game" +msgstr "Réinitialiser le Jeu" + +msgid "Reset Mappings" +msgstr "Réinit. les touches" + +msgid "Reset Settings" +msgstr "Réinitialiser" + +msgid "Retry" +msgstr "Réessayer" + +msgid "Return to Loader" +msgstr "Retourner au Loader" + +msgid "Return to Wii Menu" +msgstr "Retourner au Menu Wii" + +msgid "Right" +msgstr "Droite" + +msgid "RIGHT" +msgstr "DROITE" + +msgid "Rumble" +msgstr "Vibration" + +msgid "Save" +msgstr "Sauver" + +msgid "Save Device" +msgstr "Périph. de sauvegarde" + +msgid "Save Folder" +msgstr "Dossier des sauv." + +msgid "Save Game" +msgstr "Sauvegarder la partie" + +msgid "Save Snapshot?" +msgstr "Sauver la position du jeu ?" + +msgid "Save SRAM and Snapshot?" +msgstr "Sauver la SRAM et la position du jeu ?" + +msgid "Save successful" +msgstr "Sauvegarde réussie" + +msgid "Saving" +msgstr "Sauvegarde" + +msgid "Scaling" +msgstr "Format" + +msgid "Screen Position" +msgstr "Position de l'écran" + +msgid "Screen Zoom" +msgstr "Zoom écran" + +msgid "Settings" +msgstr "Paramètres" + +msgid "Settings - Menu" +msgstr "Paramètres - Menu" + +msgid "Settings - Network" +msgstr "Paramètres - Réseau" + +msgid "Settings - Saving & Loading" +msgstr "Paramètres - Sauvegarde & Chargement" + +msgid "Shift" +msgstr "Maj" + +msgid "SMB Share IP" +msgstr "IP Partage SMB" + +msgid "SMB Share Name" +msgstr "Nom Partage SMB" + +msgid "SMB Share Password" +msgstr "Mot de passe partage SMB" + +msgid "SMB Share Username" +msgstr "Utilisateur Partage SMB" + +msgid "Snapshot" +msgstr "Sauv. d'état" + +msgid "SNES Controller" +msgstr "Manette SNES" + +msgid "SNES Controllers (2)" +msgstr "Manettes SNES (2)" + +msgid "SNES Controllers (4)" +msgstr "Manettes SNES (4)" + +msgid "SNES Mouse" +msgstr "Souris SNES" + +msgid "SNES Mouse" +msgstr "Souris SNES" + +msgid "Snes9x - Copyright (c) Snes9x Team 1996 - 2006" +msgstr "Snes9x - Copyright (c) Snes9x Team 1996 - 2006" + +msgid "Sound Effects Volume" +msgstr "Volume des effets sonores" + +msgid "Super Scope" +msgstr "Super Scope" + +msgid "This software is open source and may be copied," +msgstr "Cette application est libre et peut être copiée," + +msgid "Unfiltered" +msgstr "Non-filtré" + +msgid "Up" +msgstr "Haut" + +msgid "UP" +msgstr "HAUT" + +msgid "Up One Level" +msgstr "Dossier Parent" + +msgid "Update Available" +msgstr "Mise à jour disponible" + +msgid "Update later" +msgstr "Mise à jour Plus tard" + +msgid "Update now" +msgstr "Mise à jour Maintenant" + +msgid "Vertical" +msgstr "Vertical" + +msgid "Video" +msgstr "Vidéo" + +msgid "Video Mode" +msgstr "Mode Vidéo" + +msgid "Wiimote" +msgstr "Wiimote" + +msgid "Wiimote Orientation" +msgstr "Orientation de la Wiimote" + +msgid "Yes" +msgstr "Oui" + \ No newline at end of file diff --git a/source/ngc/lang/jp.lang b/source/ngc/lang/jp.lang index 85d8364..c3523c4 100644 --- a/source/ngc/lang/jp.lang +++ b/source/ngc/lang/jp.lang @@ -1,2 +1,392 @@ -msgid " " +msgid "&" msgstr "" + +msgid "16:9 Correction" +msgstr "16:9アスペクト" + +msgid "An update is available!" +msgstr "アップグレードバージョンがありますよ!" + +msgid "Are you sure that you want to reset this game? Any unsaved progress will be lost." +msgstr "現在のゲームを本当にリセットしたいんですか? セーブしていないデータは無くなってしまいますよ." + +msgid "Are you sure that you want to reset your mappings?" +msgstr "コントローラーボタンコンフィグをリセットしたいんですか?" + +msgid "Are you sure that you want to reset your settings?" +msgstr "エミュレーターコンフィグをリセットしたいんですか?" + +msgid "Auto" +msgstr "オート" + +msgid "Auto Detect" +msgstr "オートディテクト" + +msgid "Auto Load" +msgstr "オートーロード" + +msgid "Auto Save" +msgstr "オートセーブ" + +msgid "Automatic (Recommended)" +msgstr "オートマチック (推奨)" + +msgid "Back" +msgstr "バック" + +msgid "Both" +msgstr "両方" + +msgid "Button Mapping" +msgstr "コントローラーボタン" + +msgid "Button Mappings" +msgstr "ボタンを決める" + +msgid "Cancel" +msgstr "キャンセル" + +msgid "Caps" +msgstr "キャップス" + +msgid "Cheats" +msgstr "チートコード" + +msgid "Cheats file not found!" +msgstr "チートファイルがない!" + +msgid "Cheats Folder" +msgstr "チートフォルダー" + +msgid "Choose Game" +msgstr "ゲームを選ぶ" + +msgid "Classic Controller" +msgstr "クラシックコントローラー" + +msgid "Close" +msgstr "閉じる" + +msgid "Coding" +msgstr "コーディング" + +msgid "Coding & menu design" +msgstr "コーディングとプログラムデザイン" + +msgid "Controller" +msgstr "コントローラー" + +msgid "Cover View" +msgstr "カバービュー" + +msgid "Covers Folder" +msgstr "カバーフォルダー" + +msgid "Credits" +msgstr "クレジット" + +msgid "Default" +msgstr "ディフォルト" + +msgid "Disabled" +msgstr "使用禁止" + +msgid "distributed, or modified under the terms of the" +msgstr "条件によって分散しているか、変更している" + +msgid "Don't Save" +msgstr "セーブしない" + +msgid "Enabled" +msgstr "使用中" + +msgid "Error" +msgstr "エラー" + +msgid "Exit" +msgstr "終了" + +msgid "Exit Action" +msgstr "行動中止"" + +msgid "Filtered" +msgstr "フィルターされた” + +msgid "Filtering" +msgstr "フィルターリング" + +msgid "Game Settings" +msgstr "ゲームコンフィグ" + +msgid "Game Settings - Button Mappings" +msgstr "ゲームコンフィグ - ボタンコンフィグ" + +msgid "Game Settings - Cheats" +msgstr "ゲームコンフィグ - チートコード" + +msgid "Game Settings - Video" +msgstr "ゲームコンフィグ - ビデオ" + +msgid "GameCube Controller" +msgstr "ゲームキューブ　コントローラー" + +msgid "GNU General Public License (GPL) Version 2." +msgstr "GNU/GPLバージョン２の免許" + +msgid "Go Back" +msgstr "戻る" + +msgid "Horizontal" +msgstr "水平方向" + +msgid "Information" +msgstr "インフォメーション" + +msgid "Justifier" +msgstr "ジャスティファイアー" + +msgid "Language" +msgstr "システム言語" + +msgid "Languages Folder" +msgstr "言語フォルダー" + +msgid "Load" +msgstr "ロード" + +msgid "Load Device" +msgstr "デバイスをロードする" + +msgid "Load Folder" +msgstr "フォルダーをロードする" + +msgid "Load Game" +msgstr "ゲーム読み込み" + +msgid "Loading" +msgstr "ゲームロード中" + +msgid "Main Menu" +msgstr "メインメニュー" + +msgid "Menu" +msgstr "メニュー" + +msgid "Menu artwork" +msgstr "メニューアートワーク " + +msgid "Menu sound" +msgstr "メニュー音" + +msgid "Music Volume" +msgstr "音楽の音量 " + +msgid "Mute" +msgstr "ミュート" + +msgid "Network" +msgstr "ネットワーク" + +msgid "No" +msgstr "いいえ" + +msgid "No game saves found." +msgstr "セーブしたデータはなかった." + +msgid "NTSC (480i)" +msgstr "" + +msgid "Nunchuk" +msgstr "ナンチャク" + +msgid "Off" +msgstr "オフ" + +msgid "Official Site: http://code.google.com/p/snes9x-gx/" +msgstr "ホームページ： http://code.google.com/p/snes9x-gx/" + +msgid "OK" +msgstr "OK" + +msgid "On" +msgstr "オン" + +msgid "Original" +msgstr "オリジナル" + +msgid "PAL (50Hz)" +msgstr "" + +msgid "PAL (60Hz)" +msgstr "" + +msgid "Please Wait" +msgstr "しばらく、そのままでお待ち下さい" + +msgid "Power off Wii" +msgstr "Wii電源を消す" + +msgid "Press any button on the Classic Controller now. Press Home to clear the existing mapping." +msgstr "今、クラシックコントローラーのいずれかのボタンを押して下さい。現在のコンフィグを消すために、ホームボタンを押して下さい。" + +msgid "Press any button on the GameCube Controller now. Press Home or the C-Stick in any direction to clear the existing mapping." +msgstr "今、ゲームキューブコントローラーのいずれかのボタンを押して下さい。現在のコンフィグを消すために、ホームかC-スティックのボタンを押して下さい。" + +msgid "Press any button on the GameCube Controller now. Press the C-Stick in any direction to clear the existing mapping." +msgstr "今、ゲームキューブコントローラーのいずれかのボタンを押して下さい。現在のコンフィグを消すために、C-スティックのボタンを押して下さい。" + +msgid "Press any button on the Wiimote now. Press Home to clear the existing mapping." +msgstr "今、Wiiリモコンのいすれかのボタンを押して下さい。 現在のコンフィグを消すために、ホームボタンを押して下さい。" + +msgid "Press any button on the Wiimote or Nunchuk now. Press Home to clear the existing mapping." +msgstr "今、Wiiリモコンかナンチャクのいずれかのボタンを押してください。現在のコンフィグを消すために、ホームボタンを押して下さい。" + +msgid "Progressive (480p)" +msgstr "プログレッシブ (480p)" + +msgid "Quit Game" +msgstr "ゲーム終了" + +msgid "Quit this game? Any unsaved progress will be lost." +msgstr "このゲームを終了したいの? セーブしなっかたデータはなくかるよ！." + +msgid "Reboot" +msgstr "リブート" + +msgid "Rendering" +msgstr "レンダリング" + +msgid "Reset" +msgstr "リセット" + +msgid "Reset Game" +msgstr "ゲームをリセットする" + +msgid "Reset Mappings" +msgstr "コントローラーボタンをリセットする" + +msgid "Reset Settings" +msgstr "セッティングをリセットする" + +msgid "Retry" +msgstr "もう一回再試行" + +msgid "Return to Loader" +msgstr "ローダーへ戻る" + +msgid "Return to Wii Menu" +msgstr "Wiiメニューに戻る" + +msgid "Rumble" +msgstr "震動" + +msgid "Save" +msgstr "セーブ" + +msgid "Save Device" +msgstr "セーブデバイス" + +msgid "Save Folder" +msgstr "セーブフォルダー" + +msgid "Save Game" +msgstr "ゲームをセーブする" + +msgid "Save Snapshot?" +msgstr "セーブステートをセーブするの?" + +msgid "Save SRAM and Snapshot?" +msgstr "ゲームのSRAMとセーブステートをセーブする?" + +msgid "Saving" +msgstr "セーブ中" + +msgid "Scaling" +msgstr "スケーリング " + +msgid "Screen Position" +msgstr "画面位置" + +msgid "Screen Zoom" +msgstr "画面ズーム" + +msgid "Settings" +msgstr "セッティング" + +msgid "Settings - Menu" +msgstr "セッティング - メニュー" + +msgid "Settings - Network" +msgstr "セッティング - ネットワーク" + +msgid "Settings - Saving & Loading" +msgstr "セッティング - セーブとロード" + +msgid "Shift" +msgstr "変わる" + +msgid "SMB Share IP" +msgstr "SMBの共有IPアドレス" + +msgid "SMB Share Name" +msgstr "SMBの共有名前" + +msgid "SMB Share Password" +msgstr "SMBの共有パスワード" + +msgid "SMB Share Username" +msgstr "SMBの共有ユーザネーム" + +msgid "Snapshot" +msgstr "スナップ" + +msgid "SNES Controller" +msgstr "SFCコントローラー" + +msgid "SNES Mouse" +msgstr "SFCマウス" + +msgid "Snes9x - Copyright (c) Snes9x Team 1996 - 2006" +msgstr "Snes9xーSnes9xティームの著作権１９９６年から２００６年" + +msgid "Sound Effects Volume" +msgstr "音の音量" + +msgid "Super Scope" +msgstr "スーパースコープ" + +msgid "This software is open source and may be copied," +msgstr "このソフトはオープンソースなので、配布することができます。" + +msgid "Unfiltered" +msgstr "フィルター無し" + +msgid "Up One Level" +msgstr "上に" + +msgid "Update Available" +msgstr "アップデートがあります" + +msgid "Update later" +msgstr "後でアップデートする" + +msgid "Update now" +msgstr "今アップデートする" + +msgid "Vertical" +msgstr "垂直" + +msgid "Video" +msgstr "ビデオ" + +msgid "Video Mode" +msgstr "ビデオモード" + +msgid "Wiimote" +msgstr "Wiiリモコン" + +msgid "Wiimote Orientation" +msgstr "Wiiリモコンの向き" + +msgid "Yes" +msgstr "はい" \ No newline at end of file diff --git a/source/ngc/lang/nl.lang b/source/ngc/lang/nl.lang index 85d8364..4ebcc36 100644 --- a/source/ngc/lang/nl.lang +++ b/source/ngc/lang/nl.lang @@ -1,2 +1,392 @@ -msgid " " +msgid "&" +msgstr "&" + +msgid "16:9 Correction" +msgstr 16:9 Correctie" + +msgid "An update is available!" +msgstr "Een update is beschikbaar!" + +msgid "Are you sure that you want to reset this game? Any unsaved progress will be lost." +msgstr "Weet je zeker dat je het spel wilt herstarten? Niet opgeslagen gegevens zullen verloren gaan." + +msgid "Are you sure that you want to reset your mappings?" +msgstr "Weet je zeker dat je de controller instellingen wilt wissen?" + +msgid "Are you sure that you want to reset your settings?" +msgstr "Weet je zeker dat je de instellingen wilt wissen?" + +msgid "Auto" +msgstr "Auto" + +msgid "Auto Detect" +msgstr "Detecteer Automatisch" + +msgid "Auto Load" +msgstr "Auto Openen" + +msgid "Auto Save" +msgstr "Auto Opslaan" + +msgid "Automatic (Recommended)" +msgstr "Automatisch (Aanbevolen)" + +msgid "Back" +msgstr "Terug" + +msgid "Both" +msgstr "Beide" + +msgid "Button Mapping" +msgstr "Controller" + +msgid "Button Mappings" +msgstr "Controller Instellingen" + +msgid "Cancel" +msgstr "Annuleren" + +msgid "Caps" +msgstr "Caps" + +msgid "Cheats" +msgstr "Cheats" + +msgid "Cheats file not found!" +msgstr "Cheats bestand niet gevonden!" + +msgid "Cheats Folder" +msgstr "Cheats Map" + +msgid "Choose Game" +msgstr "Kies Spel" + +msgid "Classic Controller" +msgstr "Traditionele Controller" + +msgid "Close" +msgstr "Sluiten" + +msgid "Coding" +msgstr "Programmeren" + +msgid "Coding & menu design" +msgstr "Programmeren & menu ontwerp" + +msgid "Controller" +msgstr "Controller" + +msgid "Cover View" +msgstr "Hoes Weergave" + +msgid "Covers Folder" +msgstr "Hoezen map" + +msgid "Credits" +msgstr "Credits" + +msgid "Default" +msgstr "Standaard" + +msgid "Disabled" +msgstr "Uitgeschakeld" + +msgid "distributed, or modified under the terms of the" +msgstr "uitgegeven, of bewerkt onder regels van de" + +msgid "Don't Save" +msgstr "Niet Opslaan" + +msgid "Enabled" +msgstr "Ingeschakeld" + +msgid "Error" +msgstr "Fout" + +msgid "Exit" +msgstr "Afsluiten" + +msgid "Exit Action" +msgstr "Afsluitactie" + +msgid "Filtered" +msgstr "Gesorteerd" + +msgid "Filtering" +msgstr "Sortering" + +msgid "Game Settings" +msgstr "Spelinstellingen" + +msgid "Game Settings - Button Mappings" +msgstr "Spelinstellingen - Controller Configuratie" + +msgid "Game Settings - Cheats" +msgstr "Spelinstellingen - Cheats" + +msgid "Game Settings - Video" +msgstr "Spelinstellingen - Video" + +msgid "GameCube Controller" +msgstr "GameCube Controller" + +msgid "GNU General Public License (GPL) Version 2." msgstr "" + +msgid "Go Back" +msgstr "Ga Terug" + +msgid "Horizontal" +msgstr "Horizontaal" + +msgid "Information" +msgstr "Informatie" + +msgid "Justifier" +msgstr "" + +msgid "Language" +msgstr "Taal" + +msgid "Languages Folder" +msgstr "Talenmap" + +msgid "Load" +msgstr "Openen" + +msgid "Load Device" +msgstr "Open Apparaat" + +msgid "Load Folder" +msgstr "Open Map" + +msgid "Load Game" +msgstr "Spel starten" + +msgid "Loading" +msgstr "Laden" + +msgid "Main Menu" +msgstr "Hoofdmenu" + +msgid "Menu" +msgstr "Menu" + +msgid "Menu artwork" +msgstr "Menu artwork" + +msgid "Menu sound" +msgstr "Menu geluid" + +msgid "Music Volume" +msgstr "Muziek volume" + +msgid "Mute" +msgstr "Stil" + +msgid "Network" +msgstr "Netwerk" + +msgid "No" +msgstr "Nee" + +msgid "No game saves found." +msgstr "Geen opgeslagen spellen gevonden." + +msgid "NTSC (480i)" +msgstr "" + +msgid "Nunchuk" +msgstr "" + +msgid "Off" +msgstr "Uit" + +msgid "Official Site: http://code.google.com/p/snes9x-gx/" +msgstr "Officile site: http://code.google.com/p/snes9x-gx/" + +msgid "OK" +msgstr "" + +msgid "On" +msgstr "Aan" + +msgid "Original" +msgstr "Origineel" + +msgid "PAL (50Hz)" +msgstr "" + +msgid "PAL (60Hz)" +msgstr "" + +msgid "Please Wait" +msgstr "Even geduld" + +msgid "Power off Wii" +msgstr "Wii uitschakelen" + +msgid "Press any button on the Classic Controller now. Press Home to clear the existing mapping." +msgstr "Druk op een knop op de Tradionele Controller. Druk op Home om de instelling te wissen." + +msgid "Press any button on the GameCube Controller now. Press Home or the C-Stick in any direction to clear the existing mapping." +msgstr "Druk op een knop op de GameCube Controller. Druk op Home of beweeg de C-stick om de instelling te wissen." + +msgid "Press any button on the GameCube Controller now. Press the C-Stick in any direction to clear the existing mapping." +msgstr "Druk op een knop op de GameCube Controller. Beweeg de C-stick om de instelling te wissen." + +msgid "Press any button on the Wiimote now. Press Home to clear the existing mapping." +msgstr "Druk op een knop op de Wiimote. Druk op Home om de instelling te wissen." + +msgid "Press any button on the Wiimote or Nunchuk now. Press Home to clear the existing mapping." +msgstr "Druk op een knop op de Wiimote of Nunchuck. Druk op Home om de instelling te wissen." + +msgid "Progressive (480p)" +msgstr "Progressief (480p)" + +msgid "Quit Game" +msgstr "Spel Afsluiten" + +msgid "Quit this game? Any unsaved progress will be lost." +msgstr "Sluit dit spel af? Niet opgeslagen gegevens zullen verloren gaan." + +msgid "Reboot" +msgstr "Herstart" + +msgid "Rendering" +msgstr "Rendering" + +msgid "Reset" +msgstr "Reset" + +msgid "Reset Game" +msgstr "Herstart Spel" + +msgid "Reset Mappings" +msgstr "Reset Controllers" + +msgid "Reset Settings" +msgstr "Reset Instellingen" + +msgid "Retry" +msgstr "Opnieuw" + +msgid "Return to Loader" +msgstr "Terug naar de Lader" + +msgid "Return to Wii Menu" +msgstr "Terug naar het Wii Menu" + +msgid "Rumble" +msgstr "Tril" + +msgid "Save" +msgstr "Opslaan" + +msgid "Save Device" +msgstr "Opslaan Apparaat" + +msgid "Save Folder" +msgstr "Opslaan Map" + +msgid "Save Game" +msgstr "Spel Opslaan" + +msgid "Save Snapshot?" +msgstr "Snapshot Opslaan?" + +msgid "Save SRAM and Snapshot?" +msgstr "SRAM en Snapshot opslaan?" + +msgid "Saving" +msgstr "Opslaan" + +msgid "Scaling" +msgstr "Schaal" + +msgid "Screen Position" +msgstr "Schermpositie" + +msgid "Screen Zoom" +msgstr "Zomen" + +msgid "Settings" +msgstr "Instellingen" + +msgid "Settings - Menu" +msgstr "Instellingen - Menu" + +msgid "Settings - Network" +msgstr "Instellingen - Netwerk" + +msgid "Settings - Saving & Loading" +msgstr "Instellingen - Laden & Opslaan" + +msgid "Shift" +msgstr "Shift" + +msgid "SMB Share IP" +msgstr "IP SMB Share" + +msgid "SMB Share Name" +msgstr "SMB Share Naam" + +msgid "SMB Share Password" +msgstr "SMB Share Wachtwoord" + +msgid "SMB Share Username" +msgstr "SMB Share Gebruiker" + +msgid "Snapshot" +msgstr "Snapshot" + +msgid "SNES Controller" +msgstr "SNES Controller" + +msgid "SNES Mouse" +msgstr "SNES Muis" + +msgid "Snes9x - Copyright (c) Snes9x Team 1996 - 2006" +msgstr "" + +msgid "Sound Effects Volume" +msgstr "Volume Geluidseffecten" + +msgid "Super Scope" +msgstr "" + +msgid "This software is open source and may be copied," +msgstr "Deze software is open source en mag gekopierd worden," + +msgid "Unfiltered" +msgstr "Ongefilterd" + +msgid "Up One Level" +msgstr "Omhoog" + +msgid "Update Available" +msgstr "Update Beschikbaar" + +msgid "Update later" +msgstr "Later Bijwerken" + +msgid "Update now" +msgstr "Nieuw Bijwerken" + +msgid "Vertical" +msgstr "Verticaal" + +msgid "Video" +msgstr "Video" + +msgid "Video Mode" +msgstr "Video Modus" + +msgid "Wiimote" +msgstr "" + +msgid "Wiimote Orientation" +msgstr "Wiimote Orientatie" + +msgid "Yes" +msgstr "Ja" diff --git a/source/ngc/menu.cpp b/source/ngc/menu.cpp index c311c15..ae41e08 100644 --- a/source/ngc/menu.cpp +++ b/source/ngc/menu.cpp @@ -152,7 +152,7 @@ WindowPrompt(const char *title, const char *msg, const char *btn1Label, const ch msgTxt.SetPosition(0,-20); msgTxt.SetWrap(true, 430); - GuiText btn1Txt(btn1Label, 24, (GXColor){0, 0, 0, 255}); + GuiText btn1Txt(btn1Label, 22, (GXColor){0, 0, 0, 255}); GuiImage btn1Img(&btnOutline); GuiImage btn1ImgOver(&btnOutlineOver); GuiButton btn1(btnOutline.GetWidth(), btnOutline.GetHeight()); @@ -177,7 +177,7 @@ WindowPrompt(const char *title, const char *msg, const char *btn1Label, const ch btn1.SetState(STATE_SELECTED); btn1.SetEffectGrow(); - GuiText btn2Txt(btn2Label, 24, (GXColor){0, 0, 0, 255}); + GuiText btn2Txt(btn2Label, 22, (GXColor){0, 0, 0, 255}); GuiImage btn2Img(&btnOutline); GuiImage btn2ImgOver(&btnOutlineOver); GuiButton btn2(btnOutline.GetWidth(), btnOutline.GetHeight()); @@ -605,7 +605,7 @@ static void OnScreenKeyboard(char * var, u32 maxlen) else trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); - GuiText okBtnTxt("OK", 24, (GXColor){0, 0, 0, 255}); + GuiText okBtnTxt("OK", 22, (GXColor){0, 0, 0, 255}); GuiImage okBtnImg(&btnOutline); GuiImage okBtnImgOver(&btnOutlineOver); GuiButton okBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); @@ -621,7 +621,7 @@ static void OnScreenKeyboard(char * var, u32 maxlen) okBtn.SetTrigger(&trigA); okBtn.SetEffectGrow(); - GuiText cancelBtnTxt("Cancel", 24, (GXColor){0, 0, 0, 255}); + GuiText cancelBtnTxt("Cancel", 22, (GXColor){0, 0, 0, 255}); GuiImage cancelBtnImg(&btnOutline); GuiImage cancelBtnImgOver(&btnOutlineOver); GuiButton cancelBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); @@ -695,7 +695,7 @@ SettingWindow(const char * title, GuiWindow * w) titleTxt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); titleTxt.SetPosition(0,14); - GuiText okBtnTxt("OK", 24, (GXColor){0, 0, 0, 255}); + GuiText okBtnTxt("OK", 22, (GXColor){0, 0, 0, 255}); GuiImage okBtnImg(&btnOutline); GuiImage okBtnImgOver(&btnOutlineOver); GuiButton okBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); @@ -711,7 +711,7 @@ SettingWindow(const char * title, GuiWindow * w) okBtn.SetTrigger(&trigA); okBtn.SetEffectGrow(); - GuiText cancelBtnTxt("Cancel", 24, (GXColor){0, 0, 0, 255}); + GuiText cancelBtnTxt("Cancel", 22, (GXColor){0, 0, 0, 255}); GuiImage cancelBtnImg(&btnOutline); GuiImage cancelBtnImgOver(&btnOutlineOver); GuiButton cancelBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); @@ -789,45 +789,45 @@ static void WindowCredits(void * ptr) txt[i] = new GuiText("Official Site: http://code.google.com/p/snes9x-gx/", 20, (GXColor){0, 0, 0, 255}); txt[i]->SetAlignment(ALIGN_CENTRE, ALIGN_TOP); txt[i]->SetPosition(0,y); i++; y+=40; - txt[i]->SetPresets(22, (GXColor){0, 0, 0, 255}, 0, + txt[i]->SetPresets(20, (GXColor){0, 0, 0, 255}, 0, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_TOP, ALIGN_LEFT, ALIGN_TOP); txt[i] = new GuiText("Coding & menu design"); - txt[i]->SetPosition(50,y); i++; + txt[i]->SetPosition(40,y); i++; txt[i] = new GuiText("Tantric"); - txt[i]->SetPosition(320,y); i++; y+=24; + txt[i]->SetPosition(335,y); i++; y+=24; txt[i] = new GuiText("Coding"); - txt[i]->SetPosition(50,y); i++; + txt[i]->SetPosition(40,y); i++; txt[i] = new GuiText("michniewski"); - txt[i]->SetPosition(320,y); i++; y+=24; + txt[i]->SetPosition(335,y); i++; y+=24; txt[i] = new GuiText("Menu artwork"); - txt[i]->SetPosition(50,y); i++; + txt[i]->SetPosition(40,y); i++; txt[i] = new GuiText("the3seashells"); - txt[i]->SetPosition(320,y); i++; y+=24; + txt[i]->SetPosition(335,y); i++; y+=24; txt[i] = new GuiText("Menu sound"); - txt[i]->SetPosition(50,y); i++; + txt[i]->SetPosition(40,y); i++; txt[i] = new GuiText("Peter de Man"); - txt[i]->SetPosition(320,y); i++; y+=48; + txt[i]->SetPosition(335,y); i++; y+=48; txt[i] = new GuiText("Snes9x GX GameCube"); - txt[i]->SetPosition(50,y); i++; + txt[i]->SetPosition(40,y); i++; txt[i] = new GuiText("SoftDev, crunchy2,"); - txt[i]->SetPosition(320,y); i++; y+=24; + txt[i]->SetPosition(335,y); i++; y+=24; txt[i] = new GuiText("eke-eke, others"); - txt[i]->SetPosition(320,y); i++; y+=24; + txt[i]->SetPosition(335,y); i++; y+=24; txt[i] = new GuiText("Snes9x"); - txt[i]->SetPosition(50,y); i++; + txt[i]->SetPosition(40,y); i++; txt[i] = new GuiText("Snes9x Team"); - txt[i]->SetPosition(320,y); i++; y+=24; + txt[i]->SetPosition(335,y); i++; y+=24; txt[i] = new GuiText("libogc / devkitPPC"); - txt[i]->SetPosition(50,y); i++; + txt[i]->SetPosition(40,y); i++; txt[i] = new GuiText("shagkur & wintermute"); - txt[i]->SetPosition(320,y); i++; y+=24; + txt[i]->SetPosition(335,y); i++; y+=24; txt[i] = new GuiText("FreeTypeGX"); - txt[i]->SetPosition(50,y); i++; + txt[i]->SetPosition(40,y); i++; txt[i] = new GuiText("Armin Tamzarian"); - txt[i]->SetPosition(320,y); i++; y+=48; + txt[i]->SetPosition(335,y); i++; y+=48; txt[i]->SetPresets(18, (GXColor){0, 0, 0, 255}, 0, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_TOP, ALIGN_CENTRE, ALIGN_TOP); @@ -905,7 +905,7 @@ static int MenuGameSelection() bool res; int i; - GuiText titleTxt("Choose Game", 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt("Choose Game", 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,50); @@ -913,8 +913,8 @@ static int MenuGameSelection() GuiSound btnSoundClick(button_click_pcm, button_click_pcm_size, SOUND_PCM); GuiImageData iconHome(icon_home_png); GuiImageData iconSettings(icon_settings_png); - GuiImageData btnOutline(button_png); - GuiImageData btnOutlineOver(button_over_png); + GuiImageData btnOutline(button_long_png); + GuiImageData btnOutlineOver(button_long_over_png); GuiTrigger trigA; if(GCSettings.WiimoteOrientation) trigA.SetSimpleTrigger(-1, WPAD_BUTTON_2 | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); @@ -923,15 +923,15 @@ static int MenuGameSelection() GuiTrigger trigHome; trigHome.SetButtonOnlyTrigger(-1, WPAD_BUTTON_HOME | WPAD_CLASSIC_BUTTON_HOME, 0); - GuiText settingsBtnTxt("Settings", 24, (GXColor){0, 0, 0, 255}); + GuiText settingsBtnTxt("Settings", 22, (GXColor){0, 0, 0, 255}); GuiImage settingsBtnIcon(&iconSettings); settingsBtnIcon.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); - settingsBtnIcon.SetPosition(20,0); + settingsBtnIcon.SetPosition(14,0); GuiImage settingsBtnImg(&btnOutline); GuiImage settingsBtnImgOver(&btnOutlineOver); GuiButton settingsBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); settingsBtn.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); - settingsBtn.SetPosition(100, -35); + settingsBtn.SetPosition(90, -35); settingsBtn.SetLabel(&settingsBtnTxt); settingsBtn.SetIcon(&settingsBtnIcon); settingsBtn.SetImage(&settingsBtnImg); @@ -941,15 +941,15 @@ static int MenuGameSelection() settingsBtn.SetTrigger(&trigA); settingsBtn.SetEffectGrow(); - GuiText exitBtnTxt("Exit", 24, (GXColor){0, 0, 0, 255}); + GuiText exitBtnTxt("Exit", 22, (GXColor){0, 0, 0, 255}); GuiImage exitBtnIcon(&iconHome); exitBtnIcon.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); - exitBtnIcon.SetPosition(20,0); + exitBtnIcon.SetPosition(14,0); GuiImage exitBtnImg(&btnOutline); GuiImage exitBtnImgOver(&btnOutlineOver); GuiButton exitBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); exitBtn.SetAlignment(ALIGN_RIGHT, ALIGN_BOTTOM); - exitBtn.SetPosition(-100, -35); + exitBtn.SetPosition(-90, -35); exitBtn.SetLabel(&exitBtnTxt); exitBtn.SetIcon(&exitBtnIcon); exitBtn.SetImage(&exitBtnImg); @@ -1133,7 +1133,7 @@ static void ControllerWindow() arrowRightBtn.SetSelectable(false); arrowRightBtn.SetUpdateCallback(ControllerWindowRightClick); - settingText = new GuiText(ctrlName[GCSettings.Controller], 24, (GXColor){0, 0, 0, 255}); + settingText = new GuiText(ctrlName[GCSettings.Controller], 22, (GXColor){0, 0, 0, 255}); int currentController = GCSettings.Controller; @@ -1157,7 +1157,7 @@ static int MenuGame() { int menu = MENU_NONE; - GuiText titleTxt((char *)Memory.ROMFilename, 24, (GXColor){255, 255, 255, 255}); + GuiText titleTxt((char *)Memory.ROMFilename, 22, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,50); @@ -1187,7 +1187,7 @@ static int MenuGame() GuiTrigger trigHome; trigHome.SetButtonOnlyTrigger(-1, WPAD_BUTTON_HOME | WPAD_CLASSIC_BUTTON_HOME, 0); - GuiText saveBtnTxt("Save", 24, (GXColor){0, 0, 0, 255}); + GuiText saveBtnTxt("Save", 22, (GXColor){0, 0, 0, 255}); GuiImage saveBtnImg(&btnLargeOutline); GuiImage saveBtnImgOver(&btnLargeOutlineOver); GuiImage saveBtnIcon(&iconSave); @@ -1203,7 +1203,7 @@ static int MenuGame() saveBtn.SetTrigger(&trigA); saveBtn.SetEffectGrow(); - GuiText loadBtnTxt("Load", 24, (GXColor){0, 0, 0, 255}); + GuiText loadBtnTxt("Load", 22, (GXColor){0, 0, 0, 255}); GuiImage loadBtnImg(&btnLargeOutline); GuiImage loadBtnImgOver(&btnLargeOutlineOver); GuiImage loadBtnIcon(&iconLoad); @@ -1219,7 +1219,7 @@ static int MenuGame() loadBtn.SetTrigger(&trigA); loadBtn.SetEffectGrow(); - GuiText resetBtnTxt("Reset", 24, (GXColor){0, 0, 0, 255}); + GuiText resetBtnTxt("Reset", 22, (GXColor){0, 0, 0, 255}); GuiImage resetBtnImg(&btnLargeOutline); GuiImage resetBtnImgOver(&btnLargeOutlineOver); GuiImage resetBtnIcon(&iconReset); @@ -1235,8 +1235,8 @@ static int MenuGame() resetBtn.SetTrigger(&trigA); resetBtn.SetEffectGrow(); - GuiText gameSettingsBtnTxt("Game Settings", 24, (GXColor){0, 0, 0, 255}); - gameSettingsBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30); + GuiText gameSettingsBtnTxt("Game Settings", 22, (GXColor){0, 0, 0, 255}); + gameSettingsBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-20); GuiImage gameSettingsBtnImg(&btnLargeOutline); GuiImage gameSettingsBtnImgOver(&btnLargeOutlineOver); GuiImage gameSettingsBtnIcon(&iconGameSettings); @@ -1252,7 +1252,7 @@ static int MenuGame() gameSettingsBtn.SetTrigger(&trigA); gameSettingsBtn.SetEffectGrow(); - GuiText mainmenuBtnTxt("Main Menu", 24, (GXColor){0, 0, 0, 255}); + GuiText mainmenuBtnTxt("Main Menu", 22, (GXColor){0, 0, 0, 255}); GuiImage mainmenuBtnImg(&btnOutline); GuiImage mainmenuBtnImgOver(&btnOutlineOver); GuiButton mainmenuBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); @@ -1266,7 +1266,7 @@ static int MenuGame() mainmenuBtn.SetTrigger(&trigA); mainmenuBtn.SetEffectGrow(); - GuiText closeBtnTxt("Close", 22, (GXColor){0, 0, 0, 255}); + GuiText closeBtnTxt("Close", 20, (GXColor){0, 0, 0, 255}); GuiImage closeBtnImg(&btnCloseOutline); GuiImage closeBtnImgOver(&btnCloseOutlineOver); GuiButton closeBtn(btnCloseOutline.GetWidth(), btnCloseOutline.GetHeight()); @@ -1300,7 +1300,7 @@ static int MenuGame() else sprintf(txt, "P%d", i+1); - batteryTxt[i] = new GuiText(txt, 22, (GXColor){255, 255, 255, 255}); + batteryTxt[i] = new GuiText(txt, 20, (GXColor){255, 255, 255, 255}); batteryTxt[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); batteryImg[i] = new GuiImage(&battery); batteryImg[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); @@ -1550,7 +1550,7 @@ static int MenuGameSaves(int action) if(!ChangeInterface(device, NOTSILENT)) return MENU_GAME; - GuiText titleTxt(NULL, 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt(NULL, 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,50); @@ -1575,7 +1575,7 @@ static int MenuGameSaves(int action) GuiTrigger trigHome; trigHome.SetButtonOnlyTrigger(-1, WPAD_BUTTON_HOME | WPAD_CLASSIC_BUTTON_HOME, 0); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255}); GuiImage backBtnImg(&btnOutline); GuiImage backBtnImgOver(&btnOutlineOver); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); @@ -1589,7 +1589,7 @@ static int MenuGameSaves(int action) backBtn.SetTrigger(&trigA); backBtn.SetEffectGrow(); - GuiText closeBtnTxt("Close", 22, (GXColor){0, 0, 0, 255}); + GuiText closeBtnTxt("Close", 20, (GXColor){0, 0, 0, 255}); GuiImage closeBtnImg(&btnCloseOutline); GuiImage closeBtnImgOver(&btnCloseOutlineOver); GuiButton closeBtn(btnCloseOutline.GetWidth(), btnCloseOutline.GetHeight()); @@ -1796,7 +1796,7 @@ static int MenuGameSettings() { int menu = MENU_NONE; - GuiText titleTxt("Game Settings", 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt("Game Settings", 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,50); @@ -1822,8 +1822,8 @@ static int MenuGameSettings() GuiTrigger trigHome; trigHome.SetButtonOnlyTrigger(-1, WPAD_BUTTON_HOME | WPAD_CLASSIC_BUTTON_HOME, 0); - GuiText mappingBtnTxt("Button Mappings", 24, (GXColor){0, 0, 0, 255}); - mappingBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30); + GuiText mappingBtnTxt("Button Mappings", 22, (GXColor){0, 0, 0, 255}); + mappingBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-20); GuiImage mappingBtnImg(&btnLargeOutline); GuiImage mappingBtnImgOver(&btnLargeOutlineOver); GuiImage mappingBtnIcon(&iconMappings); @@ -1839,8 +1839,8 @@ static int MenuGameSettings() mappingBtn.SetTrigger(&trigA); mappingBtn.SetEffectGrow(); - GuiText videoBtnTxt("Video", 24, (GXColor){0, 0, 0, 255}); - videoBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30); + GuiText videoBtnTxt("Video", 22, (GXColor){0, 0, 0, 255}); + videoBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-20); GuiImage videoBtnImg(&btnLargeOutline); GuiImage videoBtnImgOver(&btnLargeOutlineOver); GuiImage videoBtnIcon(&iconVideo); @@ -1856,7 +1856,7 @@ static int MenuGameSettings() videoBtn.SetTrigger(&trigA); videoBtn.SetEffectGrow(); - GuiText controllerBtnTxt("Controller", 24, (GXColor){0, 0, 0, 255}); + GuiText controllerBtnTxt("Controller", 22, (GXColor){0, 0, 0, 255}); GuiImage controllerBtnImg(&btnLargeOutline); GuiImage controllerBtnImgOver(&btnLargeOutlineOver); GuiImage controllerBtnIcon(&iconController); @@ -1872,7 +1872,7 @@ static int MenuGameSettings() controllerBtn.SetTrigger(&trigA); controllerBtn.SetEffectGrow(); - GuiText cheatsBtnTxt("Cheats", 24, (GXColor){0, 0, 0, 255}); + GuiText cheatsBtnTxt("Cheats", 22, (GXColor){0, 0, 0, 255}); GuiImage cheatsBtnImg(&btnLargeOutline); GuiImage cheatsBtnImgOver(&btnLargeOutlineOver); GuiImage cheatsBtnIcon(&iconCheats); @@ -1888,7 +1888,7 @@ static int MenuGameSettings() cheatsBtn.SetTrigger(&trigA); cheatsBtn.SetEffectGrow(); - GuiText closeBtnTxt("Close", 22, (GXColor){0, 0, 0, 255}); + GuiText closeBtnTxt("Close", 20, (GXColor){0, 0, 0, 255}); GuiImage closeBtnImg(&btnCloseOutline); GuiImage closeBtnImgOver(&btnCloseOutlineOver); GuiButton closeBtn(btnCloseOutline.GetWidth(), btnCloseOutline.GetHeight()); @@ -1903,7 +1903,7 @@ static int MenuGameSettings() closeBtn.SetTrigger(&trigHome); closeBtn.SetEffectGrow(); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255}); GuiImage backBtnImg(&btnOutline); GuiImage backBtnImgOver(&btnOutlineOver); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); @@ -2003,7 +2003,7 @@ static int MenuGameCheats() options.length = i; - GuiText titleTxt("Game Settings - Cheats", 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt("Game Settings - Cheats", 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,50); @@ -2018,7 +2018,7 @@ static int MenuGameCheats() else trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255}); GuiImage backBtnImg(&btnOutline); GuiImage backBtnImgOver(&btnOutlineOver); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); @@ -2079,7 +2079,7 @@ static int MenuSettingsMappings() { int menu = MENU_NONE; - GuiText titleTxt("Game Settings - Button Mappings", 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt("Game Settings - Button Mappings", 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,50); @@ -2100,8 +2100,8 @@ static int MenuSettingsMappings() else trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); - GuiText snesBtnTxt("SNES Controller", 24, (GXColor){0, 0, 0, 255}); - snesBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30); + GuiText snesBtnTxt("SNES Controller", 22, (GXColor){0, 0, 0, 255}); + snesBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-50); GuiImage snesBtnImg(&btnLargeOutline); GuiImage snesBtnImgOver(&btnLargeOutlineOver); GuiImage snesBtnIcon(&iconSNESController); @@ -2117,8 +2117,8 @@ static int MenuSettingsMappings() snesBtn.SetTrigger(&trigA); snesBtn.SetEffectGrow(); - GuiText superscopeBtnTxt("Super Scope", 24, (GXColor){0, 0, 0, 255}); - superscopeBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30); + GuiText superscopeBtnTxt("Super Scope", 22, (GXColor){0, 0, 0, 255}); + superscopeBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-20); GuiImage superscopeBtnImg(&btnLargeOutline); GuiImage superscopeBtnImgOver(&btnLargeOutlineOver); GuiImage superscopeBtnIcon(&iconSuperscope); @@ -2134,8 +2134,8 @@ static int MenuSettingsMappings() superscopeBtn.SetTrigger(&trigA); superscopeBtn.SetEffectGrow(); - GuiText mouseBtnTxt("SNES Mouse", 24, (GXColor){0, 0, 0, 255}); - mouseBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-40); + GuiText mouseBtnTxt("SNES Mouse", 22, (GXColor){0, 0, 0, 255}); + mouseBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-70); GuiImage mouseBtnImg(&btnLargeOutline); GuiImage mouseBtnImgOver(&btnLargeOutlineOver); GuiImage mouseBtnIcon(&iconMouse); @@ -2151,7 +2151,7 @@ static int MenuSettingsMappings() mouseBtn.SetTrigger(&trigA); mouseBtn.SetEffectGrow(); - GuiText justifierBtnTxt("Justifier", 24, (GXColor){0, 0, 0, 255}); + GuiText justifierBtnTxt("Justifier", 22, (GXColor){0, 0, 0, 255}); GuiImage justifierBtnImg(&btnLargeOutline); GuiImage justifierBtnImgOver(&btnLargeOutlineOver); GuiImage justifierBtnIcon(&iconJustifier); @@ -2167,7 +2167,7 @@ static int MenuSettingsMappings() justifierBtn.SetTrigger(&trigA); justifierBtn.SetEffectGrow(); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255}); GuiImage backBtnImg(&btnOutline); GuiImage backBtnImgOver(&btnOutlineOver); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); @@ -2236,12 +2236,12 @@ static int MenuSettingsMappingsController() char menuSubtitle[100]; sprintf(menuTitle, "Game Settings - Button Mappings"); - GuiText titleTxt(menuTitle, 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt(menuTitle, 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,30); sprintf(menuSubtitle, "%s", ctrlName[mapMenuCtrlSNES]); - GuiText subtitleTxt(menuSubtitle, 22, (GXColor){255, 255, 255, 255}); + GuiText subtitleTxt(menuSubtitle, 20, (GXColor){255, 255, 255, 255}); subtitleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); subtitleTxt.SetPosition(50,60); @@ -2262,8 +2262,8 @@ static int MenuSettingsMappingsController() else trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); - GuiText gamecubeBtnTxt("GameCube Controller", 24, (GXColor){0, 0, 0, 255}); - gamecubeBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30); + GuiText gamecubeBtnTxt("GameCube Controller", 22, (GXColor){0, 0, 0, 255}); + gamecubeBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-20); GuiImage gamecubeBtnImg(&btnLargeOutline); GuiImage gamecubeBtnImgOver(&btnLargeOutlineOver); GuiImage gamecubeBtnIcon(&iconGamecube); @@ -2279,7 +2279,7 @@ static int MenuSettingsMappingsController() gamecubeBtn.SetTrigger(&trigA); gamecubeBtn.SetEffectGrow(); - GuiText wiimoteBtnTxt("Wiimote", 24, (GXColor){0, 0, 0, 255}); + GuiText wiimoteBtnTxt("Wiimote", 22, (GXColor){0, 0, 0, 255}); GuiImage wiimoteBtnImg(&btnLargeOutline); GuiImage wiimoteBtnImgOver(&btnLargeOutlineOver); GuiImage wiimoteBtnIcon(&iconWiimote); @@ -2295,8 +2295,8 @@ static int MenuSettingsMappingsController() wiimoteBtn.SetTrigger(&trigA); wiimoteBtn.SetEffectGrow(); - GuiText classicBtnTxt("Classic Controller", 24, (GXColor){0, 0, 0, 255}); - classicBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30); + GuiText classicBtnTxt("Classic Controller", 22, (GXColor){0, 0, 0, 255}); + classicBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-20); GuiImage classicBtnImg(&btnLargeOutline); GuiImage classicBtnImgOver(&btnLargeOutlineOver); GuiImage classicBtnIcon(&iconClassic); @@ -2312,9 +2312,9 @@ static int MenuSettingsMappingsController() classicBtn.SetTrigger(&trigA); classicBtn.SetEffectGrow(); - GuiText nunchukBtnTxt1("Wiimote", 24, (GXColor){0, 0, 0, 255}); + GuiText nunchukBtnTxt1("Wiimote", 22, (GXColor){0, 0, 0, 255}); GuiText nunchukBtnTxt2("&", 18, (GXColor){0, 0, 0, 255}); - GuiText nunchukBtnTxt3("Nunchuk", 24, (GXColor){0, 0, 0, 255}); + GuiText nunchukBtnTxt3("Nunchuk", 22, (GXColor){0, 0, 0, 255}); nunchukBtnTxt1.SetPosition(0, -20); nunchukBtnTxt3.SetPosition(0, +20); GuiImage nunchukBtnImg(&btnLargeOutline); @@ -2334,7 +2334,7 @@ static int MenuSettingsMappingsController() nunchukBtn.SetTrigger(&trigA); nunchukBtn.SetEffectGrow(); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255}); GuiImage backBtnImg(&btnOutline); GuiImage backBtnImgOver(&btnOutlineOver); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); @@ -2540,12 +2540,12 @@ static int MenuSettingsMappingsMap() char menuSubtitle[100]; sprintf(menuTitle, "Game Settings - Button Mappings"); - GuiText titleTxt(menuTitle, 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt(menuTitle, 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,30); sprintf(menuSubtitle, "%s - %s", ctrlName[mapMenuCtrlSNES], ctrlrName[mapMenuCtrl]); - GuiText subtitleTxt(menuSubtitle, 22, (GXColor){255, 255, 255, 255}); + GuiText subtitleTxt(menuSubtitle, 20, (GXColor){255, 255, 255, 255}); subtitleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); subtitleTxt.SetPosition(50,60); @@ -2562,7 +2562,7 @@ static int MenuSettingsMappingsMap() else trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255}); GuiImage backBtnImg(&btnOutline); GuiImage backBtnImgOver(&btnOutlineOver); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); @@ -2576,7 +2576,7 @@ static int MenuSettingsMappingsMap() backBtn.SetTrigger(&trigA); backBtn.SetEffectGrow(); - GuiText resetBtnTxt("Reset", 24, (GXColor){0, 0, 0, 255}); + GuiText resetBtnTxt("Reset", 22, (GXColor){0, 0, 0, 255}); GuiImage resetBtnImg(&btnShortOutline); GuiImage resetBtnImgOver(&btnShortOutlineOver); GuiButton resetBtn(btnShortOutline.GetWidth(), btnShortOutline.GetHeight()); @@ -2637,7 +2637,7 @@ static int MenuSettingsMappingsMap() GuiOptionBrowser optionBrowser(552, 248, &options); optionBrowser.SetPosition(0, 108); optionBrowser.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); - optionBrowser.SetCol2Position(180); + optionBrowser.SetCol2Position(215); HaltGui(); GuiWindow w(screenwidth, screenheight); @@ -2824,8 +2824,8 @@ static void ScreenZoomWindow() screenPositionImg.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); screenPositionImg.SetPosition(0, 0); - settingText = new GuiText(NULL, 22, (GXColor){0, 0, 0, 255}); - settingText2 = new GuiText(NULL, 22, (GXColor){0, 0, 0, 255}); + 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); @@ -2957,7 +2957,7 @@ static void ScreenPositionWindow() GuiImage screenPositionImg(&screenPosition); screenPositionImg.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); - settingText = new GuiText(NULL, 22, (GXColor){0, 0, 0, 255}); + settingText = new GuiText(NULL, 20, (GXColor){0, 0, 0, 255}); char shift[10]; sprintf(shift, "%i, %i", GCSettings.xshift, GCSettings.yshift); settingText->SetText(shift); @@ -3002,7 +3002,7 @@ static int MenuSettingsVideo() for(i=0; i < options.length; i++) options.value[i][0] = 0; - GuiText titleTxt("Game Settings - Video", 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt("Game Settings - Video", 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,50); @@ -3017,7 +3017,7 @@ static int MenuSettingsVideo() else trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255}); GuiImage backBtnImg(&btnOutline); GuiImage backBtnImgOver(&btnOutlineOver); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); @@ -3141,14 +3141,14 @@ static int MenuSettings() { int menu = MENU_NONE; - GuiText titleTxt("Settings", 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt("Settings", 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); + GuiImageData btnOutline(button_long_png); + GuiImageData btnOutlineOver(button_long_over_png); GuiImageData btnLargeOutline(button_large_png); GuiImageData btnLargeOutlineOver(button_large_over_png); GuiImageData iconFile(icon_settings_file_png); @@ -3161,9 +3161,9 @@ static int MenuSettings() else trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); - GuiText savingBtnTxt1("Saving", 24, (GXColor){0, 0, 0, 255}); + GuiText savingBtnTxt1("Saving", 22, (GXColor){0, 0, 0, 255}); GuiText savingBtnTxt2("&", 18, (GXColor){0, 0, 0, 255}); - GuiText savingBtnTxt3("Loading", 24, (GXColor){0, 0, 0, 255}); + GuiText savingBtnTxt3("Loading", 22, (GXColor){0, 0, 0, 255}); savingBtnTxt1.SetPosition(0, -20); savingBtnTxt3.SetPosition(0, +20); GuiImage savingBtnImg(&btnLargeOutline); @@ -3183,8 +3183,8 @@ static int MenuSettings() savingBtn.SetTrigger(&trigA); savingBtn.SetEffectGrow(); - GuiText menuBtnTxt("Menu", 24, (GXColor){0, 0, 0, 255}); - menuBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30); + GuiText menuBtnTxt("Menu", 22, (GXColor){0, 0, 0, 255}); + menuBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-20); GuiImage menuBtnImg(&btnLargeOutline); GuiImage menuBtnImgOver(&btnLargeOutlineOver); GuiImage menuBtnIcon(&iconMenu); @@ -3200,8 +3200,8 @@ static int MenuSettings() menuBtn.SetTrigger(&trigA); menuBtn.SetEffectGrow(); - GuiText networkBtnTxt("Network", 24, (GXColor){0, 0, 0, 255}); - networkBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30); + GuiText networkBtnTxt("Network", 22, (GXColor){0, 0, 0, 255}); + networkBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-20); GuiImage networkBtnImg(&btnLargeOutline); GuiImage networkBtnImgOver(&btnLargeOutlineOver); GuiImage networkBtnIcon(&iconNetwork); @@ -3217,12 +3217,12 @@ static int MenuSettings() networkBtn.SetTrigger(&trigA); networkBtn.SetEffectGrow(); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + 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(100, -35); + backBtn.SetPosition(90, -35); backBtn.SetLabel(&backBtnTxt); backBtn.SetImage(&backBtnImg); backBtn.SetImageOver(&backBtnImgOver); @@ -3231,12 +3231,12 @@ static int MenuSettings() backBtn.SetTrigger(&trigA); backBtn.SetEffectGrow(); - GuiText resetBtnTxt("Reset Settings", 24, (GXColor){0, 0, 0, 255}); + GuiText resetBtnTxt("Reset Settings", 22, (GXColor){0, 0, 0, 255}); GuiImage resetBtnImg(&btnOutline); GuiImage resetBtnImgOver(&btnOutlineOver); GuiButton resetBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); resetBtn.SetAlignment(ALIGN_RIGHT, ALIGN_BOTTOM); - resetBtn.SetPosition(-100, -35); + resetBtn.SetPosition(-90, -35); resetBtn.SetLabel(&resetBtnTxt); resetBtn.SetImage(&resetBtnImg); resetBtn.SetImageOver(&resetBtnImgOver); @@ -3325,14 +3325,14 @@ static int MenuSettingsFile() for(i=0; i < options.length; i++) options.value[i][0] = 0; - GuiText titleTxt("Settings - Saving & Loading", 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt("Settings - Saving & Loading", 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); + GuiImageData btnOutline(button_long_png); + GuiImageData btnOutlineOver(button_long_over_png); GuiTrigger trigA; if(GCSettings.WiimoteOrientation) @@ -3340,12 +3340,12 @@ static int MenuSettingsFile() else trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + 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(100, -35); + backBtn.SetPosition(90, -35); backBtn.SetLabel(&backBtnTxt); backBtn.SetImage(&backBtnImg); backBtn.SetImageOver(&backBtnImgOver); @@ -3357,7 +3357,7 @@ static int MenuSettingsFile() GuiOptionBrowser optionBrowser(552, 248, &options); optionBrowser.SetPosition(0, 108); optionBrowser.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); - optionBrowser.SetCol2Position(185); + optionBrowser.SetCol2Position(215); HaltGui(); GuiWindow w(screenwidth, screenheight); @@ -3503,14 +3503,14 @@ static int MenuSettingsMenu() for(i=0; i < options.length; i++) options.value[i][0] = 0; - GuiText titleTxt("Settings - Menu", 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt("Settings - Menu", 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); + GuiImageData btnOutline(button_long_png); + GuiImageData btnOutlineOver(button_long_over_png); GuiTrigger trigA; if(GCSettings.WiimoteOrientation) @@ -3518,12 +3518,12 @@ static int MenuSettingsMenu() else trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + 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(100, -35); + backBtn.SetPosition(90, -35); backBtn.SetLabel(&backBtnTxt); backBtn.SetImage(&backBtnImg); backBtn.SetImageOver(&backBtnImgOver); @@ -3535,6 +3535,7 @@ static int MenuSettingsMenu() GuiOptionBrowser optionBrowser(552, 248, &options); optionBrowser.SetPosition(0, 108); optionBrowser.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); + optionBrowser.SetCol2Position(275); HaltGui(); GuiWindow w(screenwidth, screenheight); @@ -3679,14 +3680,14 @@ static int MenuSettingsNetwork() for(i=0; i < options.length; i++) options.value[i][0] = 0; - GuiText titleTxt("Settings - Network", 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt("Settings - Network", 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); + GuiImageData btnOutline(button_long_png); + GuiImageData btnOutlineOver(button_long_over_png); GuiTrigger trigA; if(GCSettings.WiimoteOrientation) @@ -3694,12 +3695,12 @@ static int MenuSettingsNetwork() else trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + 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(100, -35); + backBtn.SetPosition(90, -35); backBtn.SetLabel(&backBtnTxt); backBtn.SetImage(&backBtnImg); backBtn.SetImageOver(&backBtnImgOver); @@ -3711,6 +3712,7 @@ static int MenuSettingsNetwork() GuiOptionBrowser optionBrowser(552, 248, &options); optionBrowser.SetPosition(0, 108); optionBrowser.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); + optionBrowser.SetCol2Position(275); HaltGui(); GuiWindow w(screenwidth, screenheight); @@ -3765,6 +3767,7 @@ static int MenuSettingsNetwork() mainWindow->Remove(&optionBrowser); mainWindow->Remove(&w); mainWindow->Remove(&titleTxt); + CloseShare(); #endif return menu; } diff --git a/source/ngc/networkop.cpp b/source/ngc/networkop.cpp index 6c8b5ae..0bea67f 100644 --- a/source/ngc/networkop.cpp +++ b/source/ngc/networkop.cpp @@ -234,6 +234,7 @@ void CloseShare() if(networkShareInit) smbClose("smb"); networkShareInit = false; + isMounted[DEVICE_SMB] = false; } /**************************************************************************** @@ -272,9 +273,6 @@ ConnectShare (bool silent) return false; } - if(unmountRequired[DEVICE_SMB]) - CloseShare(); - if(!networkInit) InitializeNetwork(silent);