From a59c64a2925d87f859a9a21bf437badee2405e3d Mon Sep 17 00:00:00 2001 From: bgk Date: Thu, 24 Feb 2011 08:19:59 +0000 Subject: [PATCH] GTK: Mark more strings as translatable --- src/gtk/cheatedit.cpp | 6 ++--- src/gtk/directoriesconfig.cpp | 12 ++++----- src/gtk/filters.cpp | 31 +++++++++++----------- src/gtk/joypadconfig.cpp | 50 +++++++++++++++++------------------ src/gtk/screenarea-opengl.cpp | 3 ++- src/gtk/window.cpp | 10 +++---- src/gtk/windowcallbacks.cpp | 4 +-- 7 files changed, 59 insertions(+), 57 deletions(-) diff --git a/src/gtk/cheatedit.cpp b/src/gtk/cheatedit.cpp index 553ee90e..456b3b31 100644 --- a/src/gtk/cheatedit.cpp +++ b/src/gtk/cheatedit.cpp @@ -45,17 +45,17 @@ CheatEditDialog::CheatEditDialog(GtkDialog* _pstDialog, const Glib::RefPtrappend()); row[m_oTypeModel.iType] = CheatGeneric; - row[m_oTypeModel.uText] = "Generic Code"; + row[m_oTypeModel.uText] = _("Generic Code"); row = *(m_poCheatTypeStore->append()); row[m_oTypeModel.iType] = CheatGSA; - row[m_oTypeModel.uText] = "Gameshark Advance"; + row[m_oTypeModel.uText] = _("Gameshark Advance"); row = *(m_poCheatTypeStore->append()); row[m_oTypeModel.iType] = CheatCBA; - row[m_oTypeModel.uText] = "CodeBreaker Advance"; + row[m_oTypeModel.uText] = _("CodeBreaker Advance"); m_poCheatTypeComboBox->set_active(CheatGeneric); diff --git a/src/gtk/directoriesconfig.cpp b/src/gtk/directoriesconfig.cpp index ed000edc..8286b414 100644 --- a/src/gtk/directoriesconfig.cpp +++ b/src/gtk/directoriesconfig.cpp @@ -27,15 +27,15 @@ namespace VBA const DirectoriesConfigDialog::SDirEntry DirectoriesConfigDialog::m_astDirs[] = { - { "gba_roms", "GBA roms :", "GBARomsDirEntry" }, - { "gb_roms", "GB roms :", "GBRomsDirEntry" }, - { "batteries", "Batteries :", "BatteriesDirEntry" }, - { "saves", "Saves :", "SavesDirEntry" }, - { "captures", "Captures :", "CapturesDirEntry" } + { "gba_roms", _("GBA roms :"), "GBARomsDirEntry" }, + { "gb_roms", _("GB roms :"), "GBRomsDirEntry" }, + { "batteries", _("Batteries :"), "BatteriesDirEntry" }, + { "saves", _("Saves :"), "SavesDirEntry" }, + { "captures", _("Captures :"), "CapturesDirEntry" } }; DirectoriesConfigDialog::DirectoriesConfigDialog(Config::Section * _poConfig) : - Gtk::Dialog("Directories config", true, true), + Gtk::Dialog(_("Directories config"), true, true), m_poConfig(_poConfig) { Gtk::Table * poTable = Gtk::manage( new Gtk::Table(G_N_ELEMENTS(m_astDirs), 2, false)); diff --git a/src/gtk/filters.cpp b/src/gtk/filters.cpp index 45ef80fb..c501e568 100644 --- a/src/gtk/filters.cpp +++ b/src/gtk/filters.cpp @@ -17,6 +17,7 @@ // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "filters.h" +#include "intl.h" void _2xSaI (u8 *, u32, u8 *, u8 *, u32, int, int); void _2xSaI32 (u8 *, u32, u8 *, u8 *, u32, int, int); @@ -56,18 +57,18 @@ struct { } static const astFilters[] = { - { "None", 1, { 0, 0 } }, - { "2xSaI", 2, { _2xSaI, _2xSaI32 } }, - { "Super 2xSaI", 2, { Super2xSaI, Super2xSaI32 } }, - { "Super Eagle", 2, { SuperEagle, SuperEagle32 } }, - { "Pixelate", 2, { Pixelate, Pixelate32 } }, - { "AdvanceMAME Scale2x", 2, { AdMame2x, AdMame2x32 } }, - { "Bilinear", 2, { Bilinear, Bilinear32 } }, - { "Bilinear Plus", 2, { BilinearPlus, BilinearPlus32 } }, - { "Scanlines", 2, { Scanlines, Scanlines32 } }, - { "TV Mode", 2, { ScanlinesTV, ScanlinesTV32 } }, - { "hq2x", 2, { hq2x, hq2x32 } }, - { "lq2x", 2, { lq2x, lq2x32 } } + { _("None"), 1, { 0, 0 } }, + { _("2xSaI"), 2, { _2xSaI, _2xSaI32 } }, + { _("Super 2xSaI"), 2, { Super2xSaI, Super2xSaI32 } }, + { _("Super Eagle"), 2, { SuperEagle, SuperEagle32 } }, + { _("Pixelate"), 2, { Pixelate, Pixelate32 } }, + { _("AdvanceMAME Scale2x"), 2, { AdMame2x, AdMame2x32 } }, + { _("Bilinear"), 2, { Bilinear, Bilinear32 } }, + { _("Bilinear Plus"), 2, { BilinearPlus, BilinearPlus32 } }, + { _("Scanlines"), 2, { Scanlines, Scanlines32 } }, + { _("TV Mode"), 2, { ScanlinesTV, ScanlinesTV32 } }, + { _("hq2x"), 2, { hq2x, hq2x32 } }, + { _("lq2x"), 2, { lq2x, lq2x32 } } }; struct { @@ -76,9 +77,9 @@ struct { } static const astFiltersIB[] = { - { "None", { 0, 0 } }, - { "Smart interframe blending", { SmartIB, SmartIB32 } }, - { "Interframe motion blur", { MotionBlurIB, MotionBlurIB32 } } + { _("None"), { 0, 0 } }, + { _("Smart interframe blending"), { SmartIB, SmartIB32 } }, + { _("Interframe motion blur"), { MotionBlurIB, MotionBlurIB32 } } }; Filter pvGetFilter(EFilter _eFilter, EFilterDepth _eDepth) diff --git a/src/gtk/joypadconfig.cpp b/src/gtk/joypadconfig.cpp index 700a255a..e27a8b00 100644 --- a/src/gtk/joypadconfig.cpp +++ b/src/gtk/joypadconfig.cpp @@ -27,27 +27,27 @@ namespace VBA const JoypadConfigDialog::SJoypadKey JoypadConfigDialog::m_astKeys[] = { - { KEY_UP, "Up :" }, - { KEY_DOWN, "Down :" }, - { KEY_LEFT, "Left :" }, - { KEY_RIGHT, "Right :" }, - { KEY_BUTTON_A, "Button A :" }, - { KEY_BUTTON_B, "Button B :" }, - { KEY_BUTTON_L, "Button L :" }, - { KEY_BUTTON_R, "Button R :" }, - { KEY_BUTTON_SELECT, "Select :" }, - { KEY_BUTTON_START, "Start :" }, - { KEY_BUTTON_SPEED, "Speed :" }, - { KEY_BUTTON_CAPTURE, "Capture :" }, - { KEY_BUTTON_AUTO_A, "Autofire A :" }, - { KEY_BUTTON_AUTO_B, "Autofire B :" } + { KEY_UP, _("Up :") }, + { KEY_DOWN, _("Down :") }, + { KEY_LEFT, _("Left :") }, + { KEY_RIGHT, _("Right :") }, + { KEY_BUTTON_A, _("Button A :") }, + { KEY_BUTTON_B, _("Button B :") }, + { KEY_BUTTON_L, _("Button L :") }, + { KEY_BUTTON_R, _("Button R :") }, + { KEY_BUTTON_SELECT, _("Select :") }, + { KEY_BUTTON_START, _("Start :") }, + { KEY_BUTTON_SPEED, _("Speed :") }, + { KEY_BUTTON_CAPTURE, _("Capture :") }, + { KEY_BUTTON_AUTO_A, _("Autofire A :") }, + { KEY_BUTTON_AUTO_B, _("Autofire B :") } }; JoypadConfigDialog::JoypadConfigDialog(Config::Section * _poConfig) : - Gtk::Dialog("Joypad config", true, true), + Gtk::Dialog(_("Joypad config"), true, true), m_oTitleHBox(false, 5), - m_oTitleLabel("Joypad :", Gtk::ALIGN_RIGHT), - m_oDefaultJoypad("Default joypad"), + m_oTitleLabel(_("Joypad :"), Gtk::ALIGN_RIGHT), + m_oDefaultJoypad(_("Default joypad")), m_oTable(G_N_ELEMENTS(m_astKeys), 2, false), m_bUpdating(false), m_ePad(PAD_MAIN), @@ -126,20 +126,20 @@ void JoypadConfigDialog::vUpdateEntries() { int what = uiKeyval & 0xffff; std::stringstream os; - os << "Joy " << dev; + os << _("Joy ") << dev; if(what >= 128) { // joystick button int button = what - 128; - os << " Button " << button; + os << _(" Button ") << button; } else if (what < 0x20) { // joystick axis int dir = what & 1; what >>= 1; - os << " Axis " << what << (dir?'-':'+'); + os << _(" Axis ") << what << (dir?'-':'+'); } else if (what < 0x30) { @@ -147,13 +147,13 @@ void JoypadConfigDialog::vUpdateEntries() int dir = (what & 3); what = (what & 15); what >>= 2; - os << " Hat " << what << " "; + os << _(" Hat ") << what << " "; switch (dir) { - case 0: os << "Up"; break; - case 1: os << "Down"; break; - case 2: os << "Right"; break; - case 3: os << "Left"; break; + case 0: os << _("Up"); break; + case 1: os << _("Down"); break; + case 2: os << _("Right"); break; + case 3: os << _("Left"); break; } } diff --git a/src/gtk/screenarea-opengl.cpp b/src/gtk/screenarea-opengl.cpp index 28c98ee2..ab21b646 100644 --- a/src/gtk/screenarea-opengl.cpp +++ b/src/gtk/screenarea-opengl.cpp @@ -17,6 +17,7 @@ // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "screenarea-opengl.h" +#include "intl.h" #include @@ -37,7 +38,7 @@ ScreenAreaGl::ScreenAreaGl(int _iWidth, int _iHeight, int _iScale) : Gdk::GL::MODE_DOUBLE); if (!glconfig) { - fprintf(stderr, "*** OpenGL : Cannot open display.\n"); + fprintf(stderr, _("*** OpenGL : Cannot open display.\n")); throw std::exception(); } diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index a53e272c..bf61b510 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -423,7 +423,7 @@ void Window::vApplyConfigScreenArea() } catch (std::exception e) { - fprintf(stderr, "Unable to initialize output, falling back to Cairo\n"); + fprintf(stderr, _("Unable to initialize output, falling back to Cairo\n")); m_poScreenArea = Gtk::manage(new ScreenAreaCairo(m_iScreenWidth, m_iScreenHeight)); } @@ -464,7 +464,7 @@ void Window::vInitSDL() if (SDL_Init(iFlags) < 0) { - fprintf(stderr, "Failed to init SDL: %s", SDL_GetError()); + fprintf(stderr, _("Failed to init SDL: %s"), SDL_GetError()); abort(); } @@ -1111,12 +1111,12 @@ void Window::vShowSpeed(int _iSpeed) if (m_eShowSpeed == ShowPercentage) { - snprintf(csTitle, 50, "VBA-M - %d%%", _iSpeed); + snprintf(csTitle, 50, _("VBA-M - %d%%"), _iSpeed); set_title(csTitle); } else if (m_eShowSpeed == ShowDetailed) { - snprintf(csTitle, 50, "VBA-M - %d%% (%d, %d fps)", + snprintf(csTitle, 50, _("VBA-M - %d%% (%d, %d fps)"), _iSpeed, systemFrameSkip, m_iFrameCount); set_title(csTitle); } @@ -1446,7 +1446,7 @@ std::string Window::sGetUiFilePath(const std::string &_sFileName) { sUiFile = PKGDATADIR "/ui/" + _sFileName; } - + return sUiFile; } diff --git a/src/gtk/windowcallbacks.cpp b/src/gtk/windowcallbacks.cpp index 0ac8328c..21cbfaab 100644 --- a/src/gtk/windowcallbacks.cpp +++ b/src/gtk/windowcallbacks.cpp @@ -493,14 +493,14 @@ void Window::vOnHelpAbout() oAboutDialog.set_transient_for(*this); - oAboutDialog.set_name("VBA-M"); + oAboutDialog.set_name(_("VBA-M")); oAboutDialog.set_version(VERSION); oAboutDialog.set_comments(_("Nintendo GameBoy Advance emulator.")); oAboutDialog.set_license(csGPLHeader); oAboutDialog.set_copyright(csCopyright); oAboutDialog.set_logo_icon_name("vbam"); - oAboutDialog.set_website("http://vba-m.ngemu.com/"); + oAboutDialog.set_website("http://http://www.vba-m.com/"); std::list list_authors; list_authors.push_back("Forgotten");