From 4615daf357b4fe7e07015cc251f6abbd74639089 Mon Sep 17 00:00:00 2001 From: ramapcsx2 Date: Sat, 26 Feb 2011 21:55:02 +0000 Subject: [PATCH] Various translations related fixes and removed another log. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4374 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/Elfheader.cpp | 2 +- pcsx2/gui/Dialogs/FirstTimeWizard.cpp | 2 +- pcsx2/gui/MainFrame.cpp | 4 ++-- pcsx2/windows/WinCompressNTFS.cpp | 7 ++++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pcsx2/Elfheader.cpp b/pcsx2/Elfheader.cpp index 4b6c402b08..1364fa8876 100644 --- a/pcsx2/Elfheader.cpp +++ b/pcsx2/Elfheader.cpp @@ -265,7 +265,7 @@ static wxString GetMsg_InvalidELF() return _("Cannot load ELF binary image. The file may be corrupt or incomplete.") + wxString(L"\n\n") + - _("If loading from an ISO image, this error may be caused by an unsupported ISO image type or bug in PCSX2 ISO image support."); + _("If loading from an ISO image, this error may be caused by an unsupported ISO image type or a bug in PCSX2 ISO image support."); } diff --git a/pcsx2/gui/Dialogs/FirstTimeWizard.cpp b/pcsx2/gui/Dialogs/FirstTimeWizard.cpp index a0b5126d15..e48541f40f 100644 --- a/pcsx2/gui/Dialogs/FirstTimeWizard.cpp +++ b/pcsx2/gui/Dialogs/FirstTimeWizard.cpp @@ -87,7 +87,7 @@ Panels::FirstTimeIntroPanel::FirstTimeIntroPanel( wxWindow* parent ) *this += langSel | StdExpand(); *this += GetCharHeight() * 2; - *this += Heading(AddAppName(L"Welcome to %s!")).Bold(); + *this += Heading(_("Welcome to PCSX2!")).Bold() | StdExpand(); *this += GetCharHeight(); *this += Heading(AddAppName( diff --git a/pcsx2/gui/MainFrame.cpp b/pcsx2/gui/MainFrame.cpp index ad0e6ee843..b46ad497f6 100644 --- a/pcsx2/gui/MainFrame.cpp +++ b/pcsx2/gui/MainFrame.cpp @@ -362,8 +362,8 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title) int m_statusbar_widths[] = { (int)(backsize.GetWidth()*0.73), (int)(backsize.GetWidth()*0.25) }; m_statusbar.SetStatusWidths(2, m_statusbar_widths); - m_statusbar.SetStatusText( L"The Status is Good!", 0); - m_statusbar.SetStatusText( wxEmptyString, 1); + //m_statusbar.SetStatusText( L"The Status is Good!", 0); + m_statusbar.SetStatusText( wxEmptyString, 0); wxBoxSizer& joe( *new wxBoxSizer( wxVERTICAL ) ); joe.Add( &m_background ); diff --git a/pcsx2/windows/WinCompressNTFS.cpp b/pcsx2/windows/WinCompressNTFS.cpp index c49cc0b9ea..fb9022d5cd 100644 --- a/pcsx2/windows/WinCompressNTFS.cpp +++ b/pcsx2/windows/WinCompressNTFS.cpp @@ -99,14 +99,15 @@ void NTFS_CompressFile( const wxString& file, bool compressStatus ) DWORD bytesReturned = 0; DWORD compressMode = compressStatus ? COMPRESSION_FORMAT_DEFAULT : COMPRESSION_FORMAT_NONE; - BOOL result = DeviceIoControl( + /*BOOL result = */DeviceIoControl( bloated_crap, FSCTL_SET_COMPRESSION, &compressMode, 2, NULL, 0, &bytesReturned, NULL ); - if( !result ) - StreamException_LogLastError( file, L"NTFS Compress Notice" ); + // No need to see this every time on my exFAT drive (rama) + //if( !result ) + // StreamException_LogLastError( file, L"NTFS Compress Notice" ); CloseHandle( bloated_crap ); }