From ea10306daa55addf382e2a4fd1ca5c76f81ea394 Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Fri, 2 Dec 2022 22:21:13 +0000 Subject: [PATCH] translations: minor additions/adjustments Add a few translation markers for strings that are translated in the wxWidgets catalogs, which we do not pull yet. Also change the string "% of normal:" to "percent of normal:" because the percent sign was causing an error in poedit. Fix #1029. Signed-off-by: Rafael Kitover --- po/wxvbam/wxvbam.pot | 61 +++++++++++++++++++++++++---------- src/wx/CMakeLists.txt | 1 + src/wx/extra-translations.cpp | 19 +++++++++++ src/wx/xrc/GeneralConfig.xrc | 2 +- src/wx/xrc/SpeedupConfig.xrc | 2 +- 5 files changed, 66 insertions(+), 19 deletions(-) create mode 100644 src/wx/extra-translations.cpp diff --git a/po/wxvbam/wxvbam.pot b/po/wxvbam/wxvbam.pot index 9cae752c..d431c0d0 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: 2022-10-23 17:33-0700\n" +"POT-Creation-Date: 2022-12-02 22:20+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -569,7 +569,7 @@ msgstr "" msgid "ROM+HuC-1" msgstr "" -#: cmdevents.cpp:775 dialogs/display-config.cpp:338 xrc/DisplayConfig.xrc:85 +#: cmdevents.cpp:775 dialogs/display-config.cpp:343 xrc/DisplayConfig.xrc:85 #: xrc/DisplayConfig.xrc:135 xrc/DisplayConfig.xrc:221 #: xrc/GameBoyAdvanceConfig.xrc:32 xrc/GameBoyAdvanceConfig.xrc:204 #: xrc/SoundConfig.xrc:219 xrc/SoundConfig.xrc:309 @@ -824,6 +824,34 @@ msgstr "" msgid "Network is not supported in local mode." msgstr "" +#: extra-translations.cpp:12 +msgid "&Apply" +msgstr "" + +#: extra-translations.cpp:13 +msgid "Artists" +msgstr "" + +#: extra-translations.cpp:14 +msgid "Cancel" +msgstr "" + +#: extra-translations.cpp:15 +msgid "Close" +msgstr "" + +#: extra-translations.cpp:16 +msgid "Developers" +msgstr "" + +#: extra-translations.cpp:17 +msgid "License" +msgstr "" + +#: extra-translations.cpp:18 +msgid "OK" +msgstr "" + #: opts.cpp:543 opts.cpp:564 opts.cpp:769 #, c-format msgid "Invalid key binding %s for %s" @@ -1049,42 +1077,42 @@ msgstr "" msgid "No VSYNC available on this platform" msgstr "" -#: panel.cpp:2439 +#: panel.cpp:2440 msgid "memory allocation error" msgstr "" -#: panel.cpp:2442 +#: panel.cpp:2443 msgid "error initializing codec" msgstr "" -#: panel.cpp:2445 +#: panel.cpp:2446 msgid "error writing to output file" msgstr "" -#: panel.cpp:2448 +#: panel.cpp:2449 msgid "can't guess output format from file name" msgstr "" -#: panel.cpp:2453 +#: panel.cpp:2454 msgid "programming error; aborting!" msgstr "" -#: panel.cpp:2465 panel.cpp:2494 +#: panel.cpp:2466 panel.cpp:2495 #, c-format msgid "Unable to begin recording to %s (%s)" msgstr "" -#: panel.cpp:2522 +#: panel.cpp:2523 #, c-format msgid "Error in audio/video recording (%s); aborting" msgstr "" -#: panel.cpp:2528 +#: panel.cpp:2529 #, c-format msgid "Error in audio recording (%s); aborting" msgstr "" -#: panel.cpp:2538 +#: panel.cpp:2539 #, c-format msgid "Error in video recording (%s); aborting" msgstr "" @@ -1555,22 +1583,22 @@ msgstr "" msgid "Invalid value %d for option %s; valid values are %s" msgstr "" -#: dialogs/display-config.cpp:369 +#: dialogs/display-config.cpp:374 #, c-format msgid "No usable rpi plugins found in %s" msgstr "" -#: dialogs/display-config.cpp:401 dialogs/display-config.cpp:443 +#: dialogs/display-config.cpp:406 dialogs/display-config.cpp:448 #: xrc/DisplayConfig.xrc:107 msgid "Plugin" msgstr "" -#: dialogs/display-config.cpp:408 +#: dialogs/display-config.cpp:413 #, c-format msgid "Using pixel filter: %s" msgstr "" -#: dialogs/display-config.cpp:415 +#: dialogs/display-config.cpp:420 #, c-format msgid "Using interframe blending: %s" msgstr "" @@ -2849,8 +2877,7 @@ msgid "&Throttle" msgstr "" #: xrc/GeneralConfig.xrc:96 xrc/SpeedupConfig.xrc:27 -#, c-format -msgid "% of normal:" +msgid "percent of normal:" msgstr "" #: xrc/GeneralConfig.xrc:106 diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt index aab05525..2656f7ba 100644 --- a/src/wx/CMakeLists.txt +++ b/src/wx/CMakeLists.txt @@ -746,6 +746,7 @@ set( viewers.cpp gfxviewers.cpp cmdevents.cpp + extra-translations.cpp opts.cpp sys.cpp panel.cpp diff --git a/src/wx/extra-translations.cpp b/src/wx/extra-translations.cpp new file mode 100644 index 00000000..c6504847 --- /dev/null +++ b/src/wx/extra-translations.cpp @@ -0,0 +1,19 @@ +// This file is for marking some strings for translations that we are not +// pulling upstream translations for, such as the core wxWidgets translations. +// +// Please sort. + +#include "wxhead.h" + +[[maybe_unused]] void f() +{ + wxString s; + + s = _("&Apply"); + s = _("Artists"); + s = _("Cancel"); + s = _("Close"); + s = _("Developers"); + s = _("License"); + s = _("OK"); +} diff --git a/src/wx/xrc/GeneralConfig.xrc b/src/wx/xrc/GeneralConfig.xrc index 47939f8e..2117962f 100644 --- a/src/wx/xrc/GeneralConfig.xrc +++ b/src/wx/xrc/GeneralConfig.xrc @@ -93,7 +93,7 @@ wxHORIZONTAL - + wxALL|wxALIGN_CENTRE_VERTICAL 5 diff --git a/src/wx/xrc/SpeedupConfig.xrc b/src/wx/xrc/SpeedupConfig.xrc index 0feb175c..30d6650d 100644 --- a/src/wx/xrc/SpeedupConfig.xrc +++ b/src/wx/xrc/SpeedupConfig.xrc @@ -24,7 +24,7 @@ wxHORIZONTAL - + 60,-1d wxALL|wxALIGN_CENTRE_VERTICAL