diff --git a/po/wxvbam/wxvbam.pot b/po/wxvbam/wxvbam.pot index aa42a0d7..1a2805a0 100644 --- a/po/wxvbam/wxvbam.pot +++ b/po/wxvbam/wxvbam.pot @@ -3,13 +3,12 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#: ../src/wx/guiinit.cpp:2706 #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-21 00:08+1000\n" +"POT-Creation-Date: 2015-05-20 20:43+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -365,28 +364,28 @@ msgstr "" msgid "Waiting for GDB..." msgstr "" -#: ../src/wx/cmdevents.cpp:2523 +#: ../src/wx/cmdevents.cpp:2525 msgid "" "This will download and update three GBA No-Intro DAT files. Do you want to " "continue?" msgstr "" -#: ../src/wx/cmdevents.cpp:2524 +#: ../src/wx/cmdevents.cpp:2526 msgid "Confirm Update" msgstr "" -#: ../src/wx/cmdevents.cpp:2548 +#: ../src/wx/cmdevents.cpp:2550 msgid "Nintendo GameBoy (+Color+Advance) emulator." msgstr "" -#: ../src/wx/cmdevents.cpp:2549 +#: ../src/wx/cmdevents.cpp:2551 msgid "" "Copyright (C) 1999-2003 Forgotten\n" "Copyright (C) 2004-2006 VBA development team\n" "Copyright (C) 2007-2015 VBA-M development team" msgstr "" -#: ../src/wx/cmdevents.cpp:2550 +#: ../src/wx/cmdevents.cpp:2552 msgid "" "This program is free software: you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n" @@ -402,11 +401,11 @@ msgid "" "along with this program. If not, see http://www.gnu.org/licenses ." msgstr "" -#: ../src/wx/cmdevents.cpp:2786 +#: ../src/wx/cmdevents.cpp:2788 msgid "LAN link is already active. Disable link mode to disconnect." msgstr "" -#: ../src/wx/cmdevents.cpp:2793 +#: ../src/wx/cmdevents.cpp:2795 msgid "Network is not supported in local mode." msgstr "" @@ -1038,10 +1037,6 @@ msgstr "" msgid "=" msgstr "" -#: ../src/wx/wxvbam.cpp:365 -msgid "save-xrc" -msgstr "" - #: ../src/wx/wxvbam.cpp:375 msgid "Configuration/build error: can't find built-in xrc" msgstr "" @@ -1055,18 +1050,10 @@ msgid "" "built-in:" msgstr "" -#: ../src/wx/wxvbam.cpp:393 -msgid "print-cfg-path" -msgstr "" - #: ../src/wx/wxvbam.cpp:398 msgid "Configuration is read from, in order:" msgstr "" -#: ../src/wx/wxvbam.cpp:404 -msgid "save-over" -msgstr "" - #: ../src/wx/wxvbam.cpp:412 #, c-format msgid "" @@ -1090,18 +1077,6 @@ msgid "" "\n" msgstr "" -#: ../src/wx/wxvbam.cpp:436 -msgid "flag" -msgstr "" - -#: ../src/wx/wxvbam.cpp:437 ../src/wx/wxvbam.cpp:440 -msgid "string" -msgstr "" - -#: ../src/wx/wxvbam.cpp:439 -msgid "int" -msgstr "" - #: ../src/wx/wxvbam.cpp:456 msgid "" "The commands available for the Keyboard/* option are:\n" @@ -1112,11 +1087,6 @@ msgstr "" msgid "Bad configuration option or multiple ROM files given:\n" msgstr "" -#: ../src/wx/wxvbam.cpp:937 -#, c-format -msgid "%08X" -msgstr "" - #: ../src/wx/xaudio2.cpp:32 msgid "XAudio2: Enumerating devices failed!" msgstr "" @@ -1810,6 +1780,196 @@ msgstr "" msgid "Notes:" msgstr "" +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:4 +msgid "Game Boy Advance settings" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:21 +msgid "Save type :" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:27 +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:178 +#: ../src/wx/xrc/GameBoyConfig.xrc:29 ../src/wx/xrc/GameBoyConfig.xrc:59 +msgid "Automatic" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:28 +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:179 +msgid "EEPROM" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:29 +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:180 +msgid "SRAM" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:30 +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:181 +msgid "Flash" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:31 +msgid "EEPROM + Sensor" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:43 +msgid "Flash size :" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:49 +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:200 +msgid "64K" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:50 +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:201 +msgid "128K" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:64 +msgid "Detect Now" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:69 +msgid "Cartridge" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:77 +msgid "Save type" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:92 +msgid "Bios file :" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:115 +#: ../src/wx/xrc/GameBoyConfig.xrc:126 +msgid "Boot ROM" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:125 +msgid "Game Code" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:139 +msgid "Comment" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:151 +msgid "Real Time Clock:" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:159 +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:177 +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:199 +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:217 +#: ../src/wx/xrc/GameBoyConfig.xrc:138 +msgid "Default" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:160 +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:218 +msgid "Disabled" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:161 +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:219 +msgid "Enabled" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:169 +msgid "Save Type:" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:182 +msgid "EEPROM+Sensor" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:191 +msgid "Flash Size:" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:209 +msgid "Mirroring:" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:233 +msgid "&Defaults" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:240 +msgid "Game Overrides" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:4 +msgid "GameBoy settings" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:20 +msgid "Emulated &system :" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:30 ../src/wx/xrc/SoundConfig.xrc:328 +msgid "Game Boy Advance" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:31 +msgid "Game Boy Color" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:32 +msgid "Super Game Boy" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:33 +msgid "Super Game Boy 2" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:34 ../src/wx/xrc/SoundConfig.xrc:283 +msgid "Game Boy" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:48 +msgid "Display &borders :" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:57 +msgid "Never" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:58 +msgid "Always" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:72 +msgid "System" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:84 +msgid "Boot &ROM file :" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:91 ../src/wx/xrc/GameBoyConfig.xrc:113 +msgid "Select A File" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:106 +msgid "GBC Boot ROM &file :" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:144 +msgid "User 1" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:150 +msgid "User 2" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:156 +msgid "Custom Colors" +msgstr "" + #: ../src/wx/xrc/GBAROMInfo.xrc:4 msgid "Rom Information" msgstr "" @@ -2163,196 +2323,6 @@ msgstr "" msgid "0x&8800" msgstr "" -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:4 -msgid "Game Boy Advance settings" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:21 -msgid "Save type :" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:27 -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:178 -#: ../src/wx/xrc/GameBoyConfig.xrc:29 ../src/wx/xrc/GameBoyConfig.xrc:59 -msgid "Automatic" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:28 -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:179 -msgid "EEPROM" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:29 -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:180 -msgid "SRAM" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:30 -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:181 -msgid "Flash" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:31 -msgid "EEPROM + Sensor" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:43 -msgid "Flash size :" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:49 -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:200 -msgid "64K" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:50 -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:201 -msgid "128K" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:64 -msgid "Detect Now" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:69 -msgid "Cartridge" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:77 -msgid "Save type" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:92 -msgid "Bios file :" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:115 -#: ../src/wx/xrc/GameBoyConfig.xrc:126 -msgid "Boot ROM" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:125 -msgid "Game Code" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:139 -msgid "Comment" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:151 -msgid "Real Time Clock:" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:159 -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:177 -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:199 -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:217 -#: ../src/wx/xrc/GameBoyConfig.xrc:138 -msgid "Default" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:160 -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:218 -msgid "Disabled" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:161 -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:219 -msgid "Enabled" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:169 -msgid "Save Type:" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:182 -msgid "EEPROM+Sensor" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:191 -msgid "Flash Size:" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:209 -msgid "Mirroring:" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:233 -msgid "&Defaults" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:240 -msgid "Game Overrides" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:4 -msgid "GameBoy settings" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:20 -msgid "Emulated &system :" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:30 ../src/wx/xrc/SoundConfig.xrc:328 -msgid "Game Boy Advance" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:31 -msgid "Game Boy Color" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:32 -msgid "Super Game Boy" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:33 -msgid "Super Game Boy 2" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:34 ../src/wx/xrc/SoundConfig.xrc:283 -msgid "Game Boy" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:48 -msgid "Display &borders :" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:57 -msgid "Never" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:58 -msgid "Always" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:72 -msgid "System" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:84 -msgid "Boot &ROM file :" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:91 ../src/wx/xrc/GameBoyConfig.xrc:113 -msgid "Select A File" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:106 -msgid "GBC Boot ROM &file :" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:144 -msgid "User 1" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:150 -msgid "User 2" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:156 -msgid "Custom Colors" -msgstr "" - #: ../src/wx/xrc/GeneralConfig.xrc:4 msgid "General settings" msgstr "" @@ -2498,6 +2468,26 @@ msgstr "" msgid "0 " msgstr "" +#: ../src/wx/xrc/JoypadConfig.xrc:4 +msgid "Joypad Configuration" +msgstr "" + +#: ../src/wx/xrc/JoypadConfig.xrc:13 +msgid "Player 1" +msgstr "" + +#: ../src/wx/xrc/JoypadConfig.xrc:19 +msgid "Player 2" +msgstr "" + +#: ../src/wx/xrc/JoypadConfig.xrc:25 +msgid "Player 3" +msgstr "" + +#: ../src/wx/xrc/JoypadConfig.xrc:31 +msgid "Player 4" +msgstr "" + #: ../src/wx/xrc/JoyPanel.xrc:8 msgid "" "Click a field and press a key or move joystick to add. Press backspace to " @@ -2601,26 +2591,6 @@ msgstr "" msgid "Clear" msgstr "" -#: ../src/wx/xrc/JoypadConfig.xrc:4 -msgid "Joypad Configuration" -msgstr "" - -#: ../src/wx/xrc/JoypadConfig.xrc:13 -msgid "Player 1" -msgstr "" - -#: ../src/wx/xrc/JoypadConfig.xrc:19 -msgid "Player 2" -msgstr "" - -#: ../src/wx/xrc/JoypadConfig.xrc:25 -msgid "Player 3" -msgstr "" - -#: ../src/wx/xrc/JoypadConfig.xrc:31 -msgid "Player 4" -msgstr "" - #: ../src/wx/xrc/LinkConfig.xrc:4 msgid "Link configuration" msgstr "" diff --git a/src/wx/guiinit.cpp b/src/wx/guiinit.cpp index e5f23e0d..ae565070 100644 --- a/src/wx/guiinit.cpp +++ b/src/wx/guiinit.cpp @@ -2703,7 +2703,7 @@ bool MainFrame::BindControls() SetIcon(icon); // NOOP if no status area - SetStatusText(_("")); + SetStatusText(wxT("")); // Prepare system accel table for (int i = 0; i < num_def_accels; i++) diff --git a/src/wx/wxvbam.cpp b/src/wx/wxvbam.cpp index 8bbf483f..c5a15743 100644 --- a/src/wx/wxvbam.cpp +++ b/src/wx/wxvbam.cpp @@ -362,7 +362,7 @@ bool wxvbamApp::OnCmdLineParsed(wxCmdLineParser &cl) wxString s; - if (cl.Found(_("save-xrc"), &s)) + if (cl.Found(wxT("save-xrc"), &s)) { // This was most likely done on a command line, so use // stderr instead of gui for messages @@ -390,7 +390,7 @@ bool wxvbamApp::OnCmdLineParsed(wxCmdLineParser &cl) return false; } - if (cl.Found(_("print-cfg-path"))) + if (cl.Found(wxT("print-cfg-path"))) { // This was most likely done on a command line, so use // stderr instead of gui for messages @@ -401,7 +401,7 @@ bool wxvbamApp::OnCmdLineParsed(wxCmdLineParser &cl) return false; } - if (cl.Found(_("save-over"), &s)) + if (cl.Found(wxT("save-over"), &s)) { // This was most likely done on a command line, so use // stderr instead of gui for messages @@ -433,11 +433,11 @@ bool wxvbamApp::OnCmdLineParsed(wxCmdLineParser &cl) for (int i = 0; i < num_opts; i++) { wxPrintf(wxT("%s (%s"), opts[i].opt, - opts[i].boolopt ? (const wxChar*)_("flag") : - opts[i].stropt ? (const wxChar*)_("string") : + opts[i].boolopt ? (const wxChar*)wxT("flag") : + opts[i].stropt ? (const wxChar*)wxT("string") : opts[i].enumvals ? opts[i].enumvals : - opts[i].intopt ? (const wxChar*)_("int") : - (const wxChar*)_("string")); + opts[i].intopt ? (const wxChar*)wxT("int") : + (const wxChar*)wxT("string")); if (opts[i].enumvals) { @@ -934,7 +934,7 @@ void MainFrame::IdentifyRom() wxString scene_rls; wxString scene_name; wxString rom_crc32_str; - rom_crc32_str.Printf(_("%08X"), panel->rom_crc32); + rom_crc32_str.Printf(wxT("%08X"), panel->rom_crc32); if (wxGetApp().rom_database_nointro.FileExists()) {