diff --git a/bin/Langs/de_DE/pcsx2_Main.mo b/bin/Langs/de_DE/pcsx2_Main.mo index 4060cfcafa..aa71f3708f 100644 Binary files a/bin/Langs/de_DE/pcsx2_Main.mo and b/bin/Langs/de_DE/pcsx2_Main.mo differ diff --git a/locales/de_DE/pcsx2_Main.po b/locales/de_DE/pcsx2_Main.po index 75fea1d30e..8d52ef737d 100644 --- a/locales/de_DE/pcsx2_Main.po +++ b/locales/de_DE/pcsx2_Main.po @@ -2,10 +2,10 @@ # This file is distributed under the same license as the PCSX2 package. msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: pcsx2\n" "Report-Msgid-Bugs-To: http://code.google.com/p/pcsx2/\n" "POT-Creation-Date: 2014-01-30 20:26+0100\n" -"PO-Revision-Date: 2014-01-06 09:01+0100\n" +"PO-Revision-Date: 2014-01-31 11:43+0100\n" "Last-Translator: \n" "Language-Team: PCSX2\n" "Language: de_DE\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-KeywordsList: _;wxLt;pxL\n" -"X-Poedit-SourceCharset: utf-8\n" +"X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-Basepath: ..\\..\\\n" "X-Generator: Poedit 1.6.3\n" "X-Poedit-SearchPath-0: pcsx2\n" @@ -1322,7 +1322,7 @@ msgstr "Aktiviere Cheats" #: pcsx2/gui/MainFrame.cpp:427 msgid "Enable Widescreen Patches" -msgstr "Aktiviere Speedhacks" +msgstr "Aktiviere Widescreen Patches" #: pcsx2/gui/MainFrame.cpp:430 msgid "Enable Host Filesystem" diff --git a/nsis/pcsx2_full_install.nsi b/nsis/pcsx2_full_install.nsi index 923842be34..5fe9622876 100644 --- a/nsis/pcsx2_full_install.nsi +++ b/nsis/pcsx2_full_install.nsi @@ -77,6 +77,7 @@ Section "!${APP_NAME} (required)" SEC_CORE File /nonfatal /oname=gsdx32-ssse3-r${SVNREV_GSDX}.dll ..\bin\Plugins\gsdx32-ssse3.dll File /nonfatal /oname=gsdx32-sse4-r${SVNREV_GSDX}.dll ..\bin\Plugins\gsdx32-sse4.dll File /nonfatal /oname=gsdx32-avx-r${SVNREV_GSDX}.dll ..\bin\Plugins\gsdx32-avx.dll + File /nonfatal /oname=gsdx32-avx2-r${SVNREV_GSDX}.dll ..\bin\Plugins\gsdx32-avx2.dll File /nonfatal /oname=zerogs-r${SVNREV_ZEROGS}.dll ..\bin\Plugins\zerogs.dll File /nonfatal /oname=spu2-x-r${SVNREV_SPU2X}.dll ..\bin\Plugins\spu2-x.dll diff --git a/pcsx2/System.cpp b/pcsx2/System.cpp index fa1180db86..5985da0a35 100644 --- a/pcsx2/System.cpp +++ b/pcsx2/System.cpp @@ -192,10 +192,18 @@ TraceLogFilters& SetTraceConfig() // This function should be called once during program execution. void SysLogMachineCaps() { - Console.WriteLn( Color_StrongGreen, "PCSX2 %u.%u.%u.r%d %s - compiled on " __DATE__, - PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo, - SVN_REV, SVN_MODS ? "(modded)" : "" - ); + if ( !PCSX2_isReleaseVersion ) + { + Console.WriteLn(Color_StrongGreen, "PCSX2 %u.%u.%u.r%d %s - compiled on " __DATE__, + PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo, + SVN_REV, SVN_MODS ? "(modded)" : "" + ); + } + else { // shorter release version string + Console.WriteLn(Color_StrongGreen, "PCSX2 %u.%u.%u.r%d - compiled on " __DATE__, + PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo, + SVN_REV ); + } Console.WriteLn( "Savestate version: 0x%x", g_SaveVersion); Console.Newline(); diff --git a/pcsx2/gui/AppCoreThread.cpp b/pcsx2/gui/AppCoreThread.cpp index 9d558b159e..8e58d3d3b9 100644 --- a/pcsx2/gui/AppCoreThread.cpp +++ b/pcsx2/gui/AppCoreThread.cpp @@ -314,7 +314,7 @@ void AppCoreThread::ApplySettings( const Pcsx2Config& src ) int numberLoadedCheats; int numberLoadedWideScreenPatches; - int numberDbfCheatsLoaded; + int numberDbfCheatsLoaded; if (ElfCRC) gameCRC.Printf( L"%8.8x", ElfCRC ); if (!DiscSerial.IsEmpty()) gameSerial = L" [" + DiscSerial + L"]"; @@ -356,15 +356,17 @@ void AppCoreThread::ApplySettings( const Pcsx2Config& src ) gameName = L"Booting PS2 BIOS... "; } - ResetCheatsCount(); - //Till the end of this function, emtry CRC will be 00000000 - if (!gameCRC.Length()) { - Console.WriteLn(Color_Gray, "Cheats: No CRC, using 00000000 instead."); - gameCRC = L"00000000"; - } + ResetCheatsCount(); + + //Till the end of this function, entry CRC will be 00000000 + if (!gameCRC.Length() && (EmuConfig.EnableWideScreenPatches || EmuConfig.EnableCheats) ) { + Console.WriteLn(Color_Gray, "Patches: No CRC, using 00000000 instead."); + gameCRC = L"00000000"; + } + // regular cheat patches if (EmuConfig.EnableCheats) { - if (numberLoadedCheats = LoadCheats(gameCRC, PathDefs::GetCheats(), L"Cheats")) { + if (numberLoadedCheats = LoadCheats(gameCRC, PathDefs::GetCheats(), L"Cheats")) { gameCheats.Printf(L" [%d Cheats]", numberLoadedCheats); } } @@ -373,7 +375,8 @@ void AppCoreThread::ApplySettings( const Pcsx2Config& src ) if (EmuConfig.EnableWideScreenPatches) { if (numberLoadedWideScreenPatches = LoadCheats(gameCRC, PathDefs::GetCheatsWS(), L"Widescreen hacks")) { gameWsHacks.Printf(L" [%d widescreen hacks]", numberLoadedWideScreenPatches); - } else { + } + else { // No ws cheat files found at the cheats_ws folder, try the ws cheats zip file. wxString cheats_ws_archive = Path::Combine(PathDefs::GetProgramDataDir(), wxFileName(L"cheats_ws.zip")); @@ -384,7 +387,7 @@ void AppCoreThread::ApplySettings( const Pcsx2Config& src ) } } - Console.SetTitle(gameName+gameSerial+gameCompat+gameFixes+gamePatch+gameCheats+gameWsHacks); + Console.SetTitle(gameName + gameSerial + gameCompat + gameFixes + gamePatch + gameCheats + gameWsHacks); // Re-entry guard protects against cases where code wants to manually set core settings // which are not part of g_Conf. The subsequent call to apply g_Conf settings (which is diff --git a/pcsx2/gui/MainFrame.cpp b/pcsx2/gui/MainFrame.cpp index f743a22244..f128074a44 100644 --- a/pcsx2/gui/MainFrame.cpp +++ b/pcsx2/gui/MainFrame.cpp @@ -352,9 +352,7 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title) if( PCSX2_isReleaseVersion ) { // stable releases, with a simple title. - wintitle.Printf( _("%s %d.%d.%d %s"), pxGetAppName().c_str(), PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo, - SVN_MODS ? _("(modded)") : wxEmptyString - ); + wintitle.Printf( _("%s %d.%d.%d"), pxGetAppName().c_str(), PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo ); } else {