ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

... and I didn't mean to remove the translation keys either... >_< 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3258 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2010-06-21 11:43:48 +00:00
parent 0aa69b29ae
commit e98ef1a357
12 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pcsx2/gui/AppInit.cpp
View File

@ -120,7 +120,7 @@ void Pcsx2App::ReadUserModeSettings()
#if 0 #if 0
if( !hasGroup ) if( !hasGroup )
{ {
wxDialogWithHelpers beta( NULL, _fmt("Welcome to %s %u.%u.%u (r%u)", pxGetAppName().c_str(), PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo, SVN_REV ); wxDialogWithHelpers beta( NULL, _fmt("Welcome to %s %u.%u.%u (r%u)", pxGetAppName().c_str(), PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo, SVN_REV ));
beta.SetMinWidth(480); beta.SetMinWidth(480);
beta += beta.Heading( beta += beta.Heading(
@ -333,7 +333,7 @@ void Pcsx2App::AllocateCoreStuffs()
void Pcsx2App::OnInitCmdLine( wxCmdLineParser& parser ) void Pcsx2App::OnInitCmdLine( wxCmdLineParser& parser )
{ {
parser.SetLogo( AddAppName(L" >> %s -- A Playstation2 Emulator for the PC <<") + L"\n\n" + parser.SetLogo( AddAppName(" >> %s -- A Playstation2 Emulator for the PC <<") + L"\n\n" +
_("All options are for the current session only and will not be saved.\n") _("All options are for the current session only and will not be saved.\n")
); );
@ -361,7 +361,7 @@ void Pcsx2App::OnInitCmdLine( wxCmdLineParser& parser )
parser.AddOption( wxEmptyString,L"cfgpath", _("changes the configuration file path"), wxCMD_LINE_VAL_STRING ); parser.AddOption( wxEmptyString,L"cfgpath", _("changes the configuration file path"), wxCMD_LINE_VAL_STRING );
parser.AddOption( wxEmptyString,L"cfg", _("specifies the PCSX2 configuration file to use"), wxCMD_LINE_VAL_STRING ); parser.AddOption( wxEmptyString,L"cfg", _("specifies the PCSX2 configuration file to use"), wxCMD_LINE_VAL_STRING );
parser.AddSwitch( wxEmptyString,L"forcewiz", AddAppName(L"forces %s to start the First-time Wizard") ); parser.AddSwitch( wxEmptyString,L"forcewiz", AddAppName(_("forces %s to start the First-time Wizard")) );
const PluginInfo* pi = tbl_PluginInfo; do { const PluginInfo* pi = tbl_PluginInfo; do {
parser.AddOption( wxEmptyString, pi->GetShortname().Lower(), parser.AddOption( wxEmptyString, pi->GetShortname().Lower(),
@ -407,7 +407,7 @@ bool Pcsx2App::ParseOverrides( wxCmdLineParser& parser )
Console.Warning( pi->GetShortname() + L" override: " + dest ); Console.Warning( pi->GetShortname() + L" override: " + dest );
else else
{ {
wxDialogWithHelpers okcan( NULL, AddAppName(L"Plugin Override Error - %s") ); wxDialogWithHelpers okcan( NULL, AddAppName(_("Plugin Override Error - %s")) );
okcan += okcan.Heading( wxsFormat( okcan += okcan.Heading( wxsFormat(
_("%s Plugin Override Error! The following file does not exist or is not a valid %s plugin:\n\n"), _("%s Plugin Override Error! The following file does not exist or is not a valid %s plugin:\n\n"),
@ -417,7 +417,7 @@ bool Pcsx2App::ParseOverrides( wxCmdLineParser& parser )
okcan += okcan.GetCharHeight(); okcan += okcan.GetCharHeight();
okcan += okcan.Text(dest); okcan += okcan.Text(dest);
okcan += okcan.GetCharHeight(); okcan += okcan.GetCharHeight();
okcan += okcan.Heading(AddAppName(L"Press OK to use the default configured plugin, or Cancel to close %s.")); okcan += okcan.Heading(AddAppName(_("Press OK to use the default configured plugin, or Cancel to close %s.")));
if( wxID_CANCEL == pxIssueConfirmation( okcan, MsgButtons().OKCancel() ) ) return false; if( wxID_CANCEL == pxIssueConfirmation( okcan, MsgButtons().OKCancel() ) ) return false;
} }
@ -550,7 +550,7 @@ bool Pcsx2App::OnInit()
} }
catch( Exception::HardwareDeficiency& ex ) catch( Exception::HardwareDeficiency& ex )
{ {
Msgbox::Alert( ex.FormatDisplayMessage() + AddAppName(L"\n\nPress OK to close %s."), _("PCSX2 Error: Hardware Deficiency") ); Msgbox::Alert( ex.FormatDisplayMessage() + AddAppName(_("\n\nPress OK to close %s.")), _("PCSX2 Error: Hardware Deficiency") );
CleanupOnExit(); CleanupOnExit();
return false; return false;
} }
@ -562,8 +562,8 @@ bool Pcsx2App::OnInit()
catch( Exception::RuntimeError& ex ) catch( Exception::RuntimeError& ex )
{ {
Console.Error( ex.FormatDiagnosticMessage() ); Console.Error( ex.FormatDiagnosticMessage() );
Msgbox::Alert( ex.FormatDisplayMessage() + AddAppName(L"\n\nPress OK to close %s."), Msgbox::Alert( ex.FormatDisplayMessage() + AddAppName(_("\n\nPress OK to close %s.")),
AddAppName(L"%s Critical Error"), wxICON_ERROR ); AddAppName(_("%s Critical Error")), wxICON_ERROR );
CleanupOnExit(); CleanupOnExit();
return false; return false;
} }

2
pcsx2/gui/AppMain.cpp
View File

@ -296,7 +296,7 @@ void pxMessageOutputMessageBox::Printf(const wxChar* format, ...)
pos += 9; // strlen of [IsoFile] pos += 9; // strlen of [IsoFile]
wxDialogWithHelpers popup( NULL, AddAppName(L"%s Commandline Options") ); wxDialogWithHelpers popup( NULL, AddAppName(_("%s Commandline Options")) );
popup.SetMinWidth( 640 ); popup.SetMinWidth( 640 );
popup += popup.Heading(out.Mid(0, pos)); popup += popup.Heading(out.Mid(0, pos));
//popup += ; //popup += ;

2
pcsx2/gui/Dialogs/AboutBoxDialog.cpp
View File

@ -32,7 +32,7 @@ using namespace pxSizerFlags;
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
Dialogs::AboutBoxDialog::AboutBoxDialog( wxWindow* parent ) Dialogs::AboutBoxDialog::AboutBoxDialog( wxWindow* parent )
: wxDialogWithHelpers( parent, AddAppName(L"About %s"), pxDialogFlags().Resize().MinWidth( 460 ) ) : wxDialogWithHelpers( parent, AddAppName(_("About %s")), pxDialogFlags().Resize().MinWidth( 460 ) )
, m_bitmap_dualshock( this, wxID_ANY, wxBitmap( EmbeddedImage<res_Dualshock>().Get() ), , m_bitmap_dualshock( this, wxID_ANY, wxBitmap( EmbeddedImage<res_Dualshock>().Get() ),
wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN
) )

8
pcsx2/gui/Dialogs/FirstTimeWizard.cpp
View File

@ -43,7 +43,7 @@ bool ApplicableWizardPage::PrepForApply()
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
Panels::SettingsDirPickerPanel::SettingsDirPickerPanel( wxWindow* parent ) Panels::SettingsDirPickerPanel::SettingsDirPickerPanel( wxWindow* parent )
: DirPickerPanel( parent, FolderId_Settings, _("Settings"), AddAppName(L"Select a folder for %s settings") ) : DirPickerPanel( parent, FolderId_Settings, _("Settings"), AddAppName(_("Select a folder for %s settings")) )
{ {
pxSetToolTip( this, pxE( ".Tooltip:Folders:Settings", pxSetToolTip( this, pxE( ".Tooltip:Folders:Settings",
L"This is the folder where PCSX2 saves your settings, including settings generated " L"This is the folder where PCSX2 saves your settings, including settings generated "
@ -69,7 +69,7 @@ FirstTimeWizard::UsermodePage::UsermodePage( wxWizard* parent ) :
m_panel_LangSel = new LanguageSelectionPanel( &panel ); m_panel_LangSel = new LanguageSelectionPanel( &panel );
m_panel_UserSel = new DocsFolderPickerPanel( &panel ); m_panel_UserSel = new DocsFolderPickerPanel( &panel );
panel += panel.Heading(AddAppName(L"%s is starting from a new or unknown folder and needs to be configured.")).Bold(); panel += panel.Heading(AddAppName(_("%s is starting from a new or unknown folder and needs to be configured."))).Bold();
panel += m_panel_LangSel | StdCenter(); panel += m_panel_LangSel | StdCenter();
panel += m_panel_UserSel | pxExpand.Border( wxALL, 8 ); panel += m_panel_UserSel | pxExpand.Border( wxALL, 8 );
@ -117,7 +117,7 @@ bool FirstTimeWizard::UsermodePage::PrepForApply()
if( !path.Exists() ) if( !path.Exists() )
{ {
wxDialogWithHelpers dialog( NULL, _("Create folder?") ); wxDialogWithHelpers dialog( NULL, _("Create folder?") );
dialog += dialog.Heading(AddAppName(L"%s will create the following folder for documents. You can change this setting later, at any time.")); dialog += dialog.Heading(AddAppName(_("%s will create the following folder for documents. You can change this setting later, at any time.")));
dialog += 12; dialog += 12;
dialog += dialog.Heading( path.ToString() ); dialog += dialog.Heading( path.ToString() );
@ -130,7 +130,7 @@ bool FirstTimeWizard::UsermodePage::PrepForApply()
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
FirstTimeWizard::FirstTimeWizard( wxWindow* parent ) FirstTimeWizard::FirstTimeWizard( wxWindow* parent )
: wxWizard( parent, wxID_ANY, AddAppName(L"%s First Time Configuration") ) : wxWizard( parent, wxID_ANY, AddAppName(_("%s First Time Configuration")) )
, m_page_usermode ( *new UsermodePage( this ) ) , m_page_usermode ( *new UsermodePage( this ) )
, m_page_plugins ( *new ApplicableWizardPage( this, &m_page_usermode ) ) , m_page_plugins ( *new ApplicableWizardPage( this, &m_page_usermode ) )
, m_page_bios ( *new ApplicableWizardPage( this, &m_page_plugins ) ) , m_page_bios ( *new ApplicableWizardPage( this, &m_page_plugins ) )

2
pcsx2/gui/Dialogs/PickUserModeDialog.cpp
View File

@ -26,7 +26,7 @@ Dialogs::PickUserModeDialog::PickUserModeDialog( wxWindow* parent )
m_panel_usersel = new DocsFolderPickerPanel( this, false ); m_panel_usersel = new DocsFolderPickerPanel( this, false );
m_panel_langsel = new LanguageSelectionPanel( this ); m_panel_langsel = new LanguageSelectionPanel( this );
*this += Heading(AddAppName(L"%s is starting from a new or unknown folder and needs to be configured.")); *this += Heading(AddAppName(_("%s is starting from a new or unknown folder and needs to be configured.")));
*this += m_panel_langsel | pxSizerFlags::StdCenter(); *this += m_panel_langsel | pxSizerFlags::StdCenter();
*this += m_panel_usersel | wxSizerFlags().Expand().Border( wxALL, 8 ); *this += m_panel_usersel | wxSizerFlags().Expand().Border( wxALL, 8 );

4
pcsx2/gui/Dialogs/SysConfigDialog.cpp
View File

@ -25,7 +25,7 @@
using namespace Panels; using namespace Panels;
Dialogs::SysConfigDialog::SysConfigDialog(wxWindow* parent) Dialogs::SysConfigDialog::SysConfigDialog(wxWindow* parent)
: BaseConfigurationDialog( parent, AddAppName(L"Emulation Settings - %s"), 580 ) : BaseConfigurationDialog( parent, AddAppName(_("Emulation Settings - %s")), 580 )
{ {
ScopedBusyCursor busy( Cursor_ReallyBusy ); ScopedBusyCursor busy( Cursor_ReallyBusy );
@ -45,7 +45,7 @@ Dialogs::SysConfigDialog::SysConfigDialog(wxWindow* parent)
} }
Dialogs::ComponentsConfigDialog::ComponentsConfigDialog(wxWindow* parent) Dialogs::ComponentsConfigDialog::ComponentsConfigDialog(wxWindow* parent)
: BaseConfigurationDialog( parent, AddAppName(L"Components Selectors - %s"), 600 ) : BaseConfigurationDialog( parent, AddAppName(_("Components Selectors - %s")), 600 )
{ {
ScopedBusyCursor busy( Cursor_ReallyBusy ); ScopedBusyCursor busy( Cursor_ReallyBusy );

2
pcsx2/gui/ExecutorThread.cpp
View File

@ -381,7 +381,7 @@ WaitingForThreadedTaskDialog::WaitingForThreadedTaskDialog( pxThread* thr, wxWin
*this += Text( content ) | StdExpand(); *this += Text( content ) | StdExpand();
*this += 15; *this += 15;
*this += Heading(_("Press Cancel to attempt to cancel the action.")); *this += Heading(_("Press Cancel to attempt to cancel the action."));
*this += Heading(AddAppName(L"Press Terminate to kill %s immediately.")); *this += Heading(AddAppName(_("Press Terminate to kill %s immediately.")));
*this += new wxButton( this, wxID_CANCEL ); *this += new wxButton( this, wxID_CANCEL );
*this += new wxButton( this, wxID_ANY, _("Terminate App") ); *this += new wxButton( this, wxID_ANY, _("Terminate App") );

6
pcsx2/gui/IsoDropTarget.cpp
View File

@ -40,7 +40,7 @@ bool IsoDropTarget::OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filen
if( filenames.GetCount() > 1 ) if( filenames.GetCount() > 1 )
{ {
wxDialogWithHelpers dialog( m_WindowBound, _("Drag and Drop Error") ); wxDialogWithHelpers dialog( m_WindowBound, _("Drag and Drop Error") );
dialog += dialog.Heading(AddAppName(L"It is an error to drop multiple files onto a %s window. One at a time please, thank you.")); dialog += dialog.Heading(AddAppName(_("It is an error to drop multiple files onto a %s window. One at a time please, thank you.")));
pxIssueConfirmation( dialog, MsgButtons().Cancel() ); pxIssueConfirmation( dialog, MsgButtons().Cancel() );
return false; return false;
} }
@ -71,7 +71,7 @@ bool IsoDropTarget::OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filen
{ {
wxDialogWithHelpers dialog( m_WindowBound, _("Confirm PS2 Reset") ); wxDialogWithHelpers dialog( m_WindowBound, _("Confirm PS2 Reset") );
dialog += dialog.Heading(AddAppName(L"You have dropped the following ELF binary into %s:\n\n")); dialog += dialog.Heading(AddAppName(_("You have dropped the following ELF binary into %s:\n\n")));
dialog += dialog.GetCharHeight(); dialog += dialog.GetCharHeight();
dialog += dialog.Text( filenames[0] ); dialog += dialog.Text( filenames[0] );
dialog += dialog.GetCharHeight(); dialog += dialog.GetCharHeight();
@ -110,7 +110,7 @@ bool IsoDropTarget::OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filen
if (isoDetect(&iso)) if (isoDetect(&iso))
{ {
Console.WriteLn( L"(Drag&Drop) Found valid ISO file type!" ); Console.WriteLn( L"(Drag&Drop) Found valid ISO file type!" );
SwapOrReset_Iso(m_WindowBound, stopped_core, filenames[0], AddAppName(L"You have dropped the following ISO image into %s:")); SwapOrReset_Iso(m_WindowBound, stopped_core, filenames[0], AddAppName(_("You have dropped the following ISO image into %s:")));
} }
_closefile( iso.handle ); _closefile( iso.handle );

4
pcsx2/gui/MainFrame.cpp
View File

@ -398,7 +398,7 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title)
_("Wipes all internal VM states and shuts down plugins.")); _("Wipes all internal VM states and shuts down plugins."));
m_menuSys.Append(MenuId_Exit, _("Exit"), m_menuSys.Append(MenuId_Exit, _("Exit"),
AddAppName(L"Closing %s may be hazardous to your health")); AddAppName(_("Closing %s may be hazardous to your health")));
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
@ -440,7 +440,7 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title)
m_menuConfig.AppendSeparator(); m_menuConfig.AppendSeparator();
m_menuConfig.Append(MenuId_Config_ResetAll, _("Clear all settings..."), m_menuConfig.Append(MenuId_Config_ResetAll, _("Clear all settings..."),
AddAppName(L"Clears all %s settings and re-runs the startup wizard.")); AddAppName(_("Clears all %s settings and re-runs the startup wizard.")));
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------

2
pcsx2/gui/Panels/DirPickerPanel.cpp
View File

@ -221,7 +221,7 @@ void Panels::DirPickerPanel::Apply()
if( !wxDir::Exists( path ) ) if( !wxDir::Exists( path ) )
{ {
wxDialogWithHelpers dialog( NULL, _("Create folder?") ); wxDialogWithHelpers dialog( NULL, _("Create folder?") );
dialog += dialog.Heading(AddAppName(L"A configured folder does not exist. Should %s try to create it?")); dialog += dialog.Heading(AddAppName(_("A configured folder does not exist. Should %s try to create it?")));
dialog += 12; dialog += 12;
dialog += dialog.Heading( path ); dialog += dialog.Heading( path );

4
pcsx2/gui/Panels/MemoryCardListPanel.cpp
View File

@ -557,11 +557,11 @@ void Panels::MemoryCardListPanel_Simple::OnCreateCard(wxCommandEvent& evt)
if( m_Cards[slot].IsFormatted ) if( m_Cards[slot].IsFormatted )
{ {
wxString content; wxString content;
content.Printf(wxsFormat( content.Printf(
pxE( ".Popup:Mcd:Delete", pxE( ".Popup:Mcd:Delete",
L"You are about to delete the formatted memory card in slot %u. " L"You are about to delete the formatted memory card in slot %u. "
L"All data on this card will be lost! Are you absolutely and quite positively sure?" L"All data on this card will be lost! Are you absolutely and quite positively sure?"
), slot ) ), slot
); );
result = Msgbox::YesNo( content, _("Delete memory card?") ); result = Msgbox::YesNo( content, _("Delete memory card?") );

2
pcsx2/gui/Panels/MiscPanelStuff.cpp
View File

@ -63,7 +63,7 @@ Panels::DocsFolderPickerPanel::DocsFolderPickerPanel( wxWindow* parent, bool isF
m_radio_UserMode->Realize(); m_radio_UserMode->Realize();
if( pxStaticText* woot = m_radio_UserMode->GetSubText(0) ) woot->Unwrapped(); // wrapping sucks for path names! if( pxStaticText* woot = m_radio_UserMode->GetSubText(0) ) woot->Unwrapped(); // wrapping sucks for path names!
m_dirpicker_custom = new DirPickerPanel( this, FolderId_Documents, AddAppName(L"Select a document root for %s") ); m_dirpicker_custom = new DirPickerPanel( this, FolderId_Documents, AddAppName(_("Select a document root for %s")) );
*this += Heading( isFirstTime ? usermodeExplained : usermodeWarning ); *this += Heading( isFirstTime ? usermodeExplained : usermodeWarning );
*this += m_radio_UserMode | StdExpand(); *this += m_radio_UserMode | StdExpand();