From d756f6716f7939f9906fe9fa6e9fd217df765cfd Mon Sep 17 00:00:00 2001 From: Stanley Kid Date: Fri, 10 Feb 2023 05:45:25 +0000 Subject: [PATCH] translations: fix some source strings Fix some more strings marked for translation in the source code to be more correct and easier to localize. References #1071 #1029 Signed-off-by: Rafael Kitover --- po/wxvbam/wxvbam.pot | 96 +++++++++------------- src/wx/cmdevents.cpp | 8 +- src/wx/config/internal/option-internal.cpp | 2 +- src/wx/dsound.cpp | 2 +- src/wx/guiinit.cpp | 4 +- src/wx/xrc/DisplayConfig.xrc | 2 +- src/wx/xrc/JoyPanel.xrc | 2 +- src/wx/xrc/MainMenu.xrc | 2 +- 8 files changed, 48 insertions(+), 70 deletions(-) diff --git a/po/wxvbam/wxvbam.pot b/po/wxvbam/wxvbam.pot index 174f94b7..03adb04c 100644 --- a/po/wxvbam/wxvbam.pot +++ b/po/wxvbam/wxvbam.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-02-06 14:51-0800\n" +"POT-Creation-Date: 2023-02-10 05:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,60 +17,60 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: wxvbam.cpp:265 +#: wxvbam.cpp:264 msgid "visualboyadvance-m" msgstr "" -#: wxvbam.cpp:329 wxvbam.cpp:346 +#: wxvbam.cpp:333 wxvbam.cpp:350 #, c-format msgid "Invalid configuration file provided: %s" msgstr "" -#: wxvbam.cpp:484 +#: wxvbam.cpp:489 msgid "Could not create main window" msgstr "" -#: wxvbam.cpp:565 +#: wxvbam.cpp:570 msgid "Save built-in XRC file and exit" msgstr "" -#: wxvbam.cpp:568 +#: wxvbam.cpp:573 msgid "Save built-in vba-over.ini and exit" msgstr "" -#: wxvbam.cpp:571 +#: wxvbam.cpp:576 msgid "Print configuration path and exit" msgstr "" -#: wxvbam.cpp:574 +#: wxvbam.cpp:579 msgid "Start in full-screen mode" msgstr "" -#: wxvbam.cpp:577 +#: wxvbam.cpp:582 msgid "Set a configuration file" msgstr "" -#: wxvbam.cpp:581 +#: wxvbam.cpp:586 msgid "Delete shared link state first, if it exists" msgstr "" -#: wxvbam.cpp:588 +#: wxvbam.cpp:593 msgid "List all settable options and exit" msgstr "" -#: wxvbam.cpp:591 +#: wxvbam.cpp:596 msgid "ROM file" msgstr "" -#: wxvbam.cpp:593 +#: wxvbam.cpp:598 msgid "=" msgstr "" -#: wxvbam.cpp:624 +#: wxvbam.cpp:629 msgid "Configuration / build error: can't find built-in xrc" msgstr "" -#: wxvbam.cpp:632 +#: wxvbam.cpp:637 #, c-format msgid "" "Wrote built-in configuration to %s.\n" @@ -79,11 +79,11 @@ msgid "" "built-in:" msgstr "" -#: wxvbam.cpp:646 +#: wxvbam.cpp:651 msgid "Configuration is read from, in order:" msgstr "" -#: wxvbam.cpp:660 +#: wxvbam.cpp:665 #, c-format msgid "" "Wrote built-in override file to %s\n" @@ -91,13 +91,13 @@ msgid "" "from search path:" msgstr "" -#: wxvbam.cpp:666 +#: wxvbam.cpp:671 msgid "" "\n" "\tbuilt-in" msgstr "" -#: wxvbam.cpp:681 +#: wxvbam.cpp:686 msgid "" "Options set from the command line are saved if any configuration changes are " "made in the user interface.\n" @@ -106,17 +106,17 @@ msgid "" "\n" msgstr "" -#: wxvbam.cpp:689 +#: wxvbam.cpp:694 msgid "" "The commands available for the Keyboard/* option are:\n" "\n" msgstr "" -#: wxvbam.cpp:700 +#: wxvbam.cpp:705 msgid "Configuration file not found." msgstr "" -#: wxvbam.cpp:731 +#: wxvbam.cpp:736 msgid "Bad configuration option or multiple ROM files given:\n" msgstr "" @@ -188,11 +188,11 @@ msgstr "" msgid "Removing cheats" msgstr "" -#: guiinit.cpp:759 +#: guiinit.cpp:759 xrc/JoyPanel.xrc:364 msgid "Game Shark" msgstr "" -#: guiinit.cpp:760 +#: guiinit.cpp:760 cmdevents.cpp:703 msgid "Game Genie" msgstr "" @@ -216,11 +216,6 @@ msgstr "" msgid "Number cannot be empty" msgstr "" -#: guiinit.cpp:871 -#, c-format -msgid "Search produced %d results. Please refine better" -msgstr "" - #: guiinit.cpp:883 msgid "Search produced no results" msgstr "" @@ -554,12 +549,8 @@ msgstr "" msgid "ROM + MBC7 + BATT" msgstr "" -#: cmdevents.cpp:703 -msgid "GameGenie" -msgstr "" - #: cmdevents.cpp:707 -msgid "GameShark V3.0" +msgid "Game Shark 3.0" msgstr "" #: cmdevents.cpp:711 @@ -665,8 +656,8 @@ msgstr "" #: cmdevents.cpp:1066 msgid "" -"GS & PAC Snapshots (*.sps;*.xps)|*.sps;*.xps|Game Shark SP Snapshots (*.gsv)|" -"*.gsv" +"Game Shark & PAC Snapshots (*.sps;*.xps)|*.sps;*.xps|Game Shark SP Snapshots " +"(*.gsv)|*.gsv" msgstr "" #: cmdevents.cpp:1066 @@ -806,7 +797,7 @@ msgid "FACTORY RESET" msgstr "" #: cmdevents.cpp:2897 -msgid "Nintendo Game Boy / Color / Advance) emulator." +msgid "Nintendo Game Boy / Color / Advance emulator." msgstr "" #: cmdevents.cpp:2898 @@ -872,23 +863,23 @@ msgstr "" msgid "OK" msgstr "" -#: opts.cpp:354 +#: opts.cpp:384 msgid "" "The INI file was written for a more recent version of VBA-M. Some INI option " "values may have been reset." msgstr "" -#: opts.cpp:521 opts.cpp:542 opts.cpp:778 +#: opts.cpp:551 opts.cpp:572 opts.cpp:808 #, c-format msgid "Invalid key binding %s for %s" msgstr "" -#: opts.cpp:701 opts.cpp:710 opts.cpp:719 opts.cpp:728 config/option.cpp:464 +#: opts.cpp:731 opts.cpp:740 opts.cpp:749 opts.cpp:758 config/option.cpp:464 #, c-format msgid "Invalid value %s for option %s" msgstr "" -#: opts.cpp:800 +#: opts.cpp:830 #, c-format msgid "Unknown option %s with value %s" msgstr "" @@ -1406,7 +1397,7 @@ msgid "Break into GDB after loading the game." msgstr "" #: config/internal/option-internal.cpp:461 -msgid "Port to connect GDB to." +msgid "Port to connect GDB to" msgstr "" #: config/internal/option-internal.cpp:464 @@ -1703,12 +1694,7 @@ msgstr "" msgid "FAudio: Creating source voice failed!" msgstr "" -#: dsound.cpp:89 -#, c-format -msgid "Cannot create DirectSound %08x" -msgstr "" - -#: dsound.cpp:103 +#: dsound.cpp:89 dsound.cpp:103 #, c-format msgid "Cannot create Direct Sound %08x" msgstr "" @@ -2153,7 +2139,7 @@ msgid "Filters" msgstr "" #: xrc/DisplayConfig.xrc:79 -msgid "Display filter :" +msgid "Display filter:" msgstr "" #: xrc/DisplayConfig.xrc:86 @@ -3046,10 +3032,6 @@ msgstr "" msgid "Motion Left / Dark" msgstr "" -#: xrc/JoyPanel.xrc:364 -msgid "GameShark" -msgstr "" - #: xrc/JoyPanel.xrc:386 msgid "Motion Right / Light" msgstr "" @@ -3318,18 +3300,14 @@ msgstr "" msgid "Game Shark &code file..." msgstr "" -#: xrc/MainMenu.xrc:164 -msgid "&Gameshark snapshot..." +#: xrc/MainMenu.xrc:164 xrc/MainMenu.xrc:173 +msgid "&Game Shark snapshot..." msgstr "" #: xrc/MainMenu.xrc:166 msgid "&Import" msgstr "" -#: xrc/MainMenu.xrc:173 -msgid "&Game Shark snapshot..." -msgstr "" - #: xrc/MainMenu.xrc:175 msgid "&Export" msgstr "" diff --git a/src/wx/cmdevents.cpp b/src/wx/cmdevents.cpp index 5bcd6fda..06025506 100644 --- a/src/wx/cmdevents.cpp +++ b/src/wx/cmdevents.cpp @@ -700,11 +700,11 @@ EVT_HANDLER_MASK(RomInformation, "ROM information...", CMDEN_GB | CMDEN_GBA) break; case 0x55: - type = _("GameGenie"); + type = _("Game Genie"); break; case 0x56: - type = _("GameShark V3.0"); + type = _("Game Shark 3.0"); break; case 0xfc: @@ -1063,7 +1063,7 @@ EVT_HANDLER_MASK(ImportGamesharkActionReplaySnapshot, "Import Game Shark Action Replay snapshot...", CMDEN_GB | CMDEN_GBA) { wxFileDialog dlg(this, _("Select snapshot file"), gss_path, wxEmptyString, - panel->game_type() == IMAGE_GBA ? _("GS & PAC Snapshots (*.sps;*.xps)|*.sps;*.xps|Game Shark SP Snapshots (*.gsv)|*.gsv") : _("Game Boy Snapshot (*.gbs)|*.gbs"), + panel->game_type() == IMAGE_GBA ? _("Game Shark & PAC Snapshots (*.sps;*.xps)|*.sps;*.xps|Game Shark SP Snapshots (*.gsv)|*.gsv") : _("Game Boy Snapshot (*.gbs)|*.gbs"), wxFD_OPEN | wxFD_FILE_MUST_EXIST); int ret = ShowModal(&dlg); gss_path = dlg.GetDirectory(); @@ -2894,7 +2894,7 @@ EVT_HANDLER(wxID_ABOUT, "About...") // but at least win32 standard about is nothing special ai.SetWebSite(wxT("http://www.vba-m.com/")); ai.SetIcon(GetIcons().GetIcon(wxSize(32, 32), wxIconBundle::FALLBACK_NEAREST_LARGER)); - ai.SetDescription(_("Nintendo Game Boy / Color / Advance) emulator.")); + ai.SetDescription(_("Nintendo Game Boy / Color / Advance emulator.")); ai.SetCopyright(_("Copyright (C) 1999-2003 Forgotten\nCopyright (C) 2004-2006 VBA development team\nCopyright (C) 2007-2020 VBA-M development team")); ai.SetLicense(_( "This program is free software: you can redistribute it and / or modify\n" diff --git a/src/wx/config/internal/option-internal.cpp b/src/wx/config/internal/option-internal.cpp index dfeb2009..019be967 100644 --- a/src/wx/config/internal/option-internal.cpp +++ b/src/wx/config/internal/option-internal.cpp @@ -458,7 +458,7 @@ const std::array kAllOptionsData = { OptionData{"preferences/gdbBreakOnLoad", "DebugGDBBreakOnLoad", _("Break into GDB after loading the game.")}, OptionData{"preferences/gdbPort", "DebugGDBPort", - _("Port to connect GDB to.")}, + _("Port to connect GDB to")}, #ifndef NO_LINK OptionData{"preferences/LinkNumPlayers", "", _("Number of players in network")}, diff --git a/src/wx/dsound.cpp b/src/wx/dsound.cpp index 6cd8acc9..c5b44125 100644 --- a/src/wx/dsound.cpp +++ b/src/wx/dsound.cpp @@ -86,7 +86,7 @@ bool DirectSound::init(long sampleRate) hr = CoCreateInstance(CLSID_DirectSound8, NULL, CLSCTX_INPROC_SERVER, IID_IDirectSound8, (LPVOID*)&pDirectSound); if (hr != S_OK) { - wxLogError(_("Cannot create DirectSound %08x"), hr); + wxLogError(_("Cannot create Direct Sound %08x"), hr); return false; } diff --git a/src/wx/guiinit.cpp b/src/wx/guiinit.cpp index 5a981a13..8de536f2 100644 --- a/src/wx/guiinit.cpp +++ b/src/wx/guiinit.cpp @@ -864,7 +864,7 @@ public: // since listctrl is virtual, it should be able to handle // at least 256k results, which is about the most you // will ever get -#if 0 +/* if (list->addrs.size() > 1000) { @@ -874,7 +874,7 @@ public: return; } -#endif +*/ } } } diff --git a/src/wx/xrc/DisplayConfig.xrc b/src/wx/xrc/DisplayConfig.xrc index 6fc91ced..be26b9cd 100644 --- a/src/wx/xrc/DisplayConfig.xrc +++ b/src/wx/xrc/DisplayConfig.xrc @@ -76,7 +76,7 @@ wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL 5 - + diff --git a/src/wx/xrc/JoyPanel.xrc b/src/wx/xrc/JoyPanel.xrc index f5931ec0..dfad4687 100644 --- a/src/wx/xrc/JoyPanel.xrc +++ b/src/wx/xrc/JoyPanel.xrc @@ -361,7 +361,7 @@ - + wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL 5 diff --git a/src/wx/xrc/MainMenu.xrc b/src/wx/xrc/MainMenu.xrc index 4cffaad6..81724730 100644 --- a/src/wx/xrc/MainMenu.xrc +++ b/src/wx/xrc/MainMenu.xrc @@ -161,7 +161,7 @@ - +